Merge commit 'aa8b39d9'

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

Conflicts:
	libavcodec/allcodecs.c

See: f5f98727Merged-by: Michael Niedermayer <michaelni@gmx.at>