[FFmpeg-cvslog] Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  1 13:19:00 2013 +0100| [76f8d3c8d9211daca678747e9521c7ed9e90aba9] | committer: Michael Niedermayer

Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'

* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
  lls: move to the private namespace

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76f8d3c8d9211daca678747e9521c7ed9e90aba9
---