Merge commit '527617485914004dc8b772056322ea5ae74c800d' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:26:41 +0000 (02:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:26:55 +0000 (02:26 +0100)
commit099e0178bf560154f39f9043c0f915396f06e706
tree65f16e4ed56413c3ad92669dd53f0504ca5d45cf
parentdc84cf241cccf440dbad2e3bf31784be7ff1d0f6
parent527617485914004dc8b772056322ea5ae74c800d
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@gmx.at>