-
Michael Niedermayer authored
* commit 'f9cc6883': mp3enc: add an option for disabling the Xing frame. Conflicts: doc/muxers.texi libavformat/mp3enc.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
5049b6a1
* commit 'f9cc6883': mp3enc: add an option for disabling the Xing frame. Conflicts: doc/muxers.texi libavformat/mp3enc.c Merged-by:Michael Niedermayer <michaelni@gmx.at>