[FFmpeg-cvslog] Merge commit '527617485914004dc8b772056322ea5ae74c800d' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:26:41 2015 +0100| [099e0178bf560154f39f9043c0f915396f06e706] | committer: Michael Niedermayer

Merge commit '527617485914004dc8b772056322ea5ae74c800d' into release/2.4

* commit '527617485914004dc8b772056322ea5ae74c800d':
  lavc: Move the libtwolame encoder registration to the list for external libraries

Conflicts:
	libavcodec/allcodecs.c

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

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