Merge commit 'aa8b39d999589154f79300de9038994d0093cd34'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Nov 2014 20:02:17 +0000 (21:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Nov 2014 20:26:01 +0000 (21:26 +0100)
* commit 'aa8b39d999589154f79300de9038994d0093cd34':
  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>

Trivial merge