Michael Niedermayer e744e9a305 Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9' ...

* commit 'ef363ebd596da18f889a7d4845023a23dfac84c9':
  mp3enc: write full LAME frame

Conflicts:
	libavformat/mp3enc.c

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

2014-10-24 15:30:12 +02:00

..

latm

…

mp3

Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'

2014-10-24 15:30:12 +02:00

ogg_vp3

…