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
..
2014-10-24 09:53:41 +03:00
2014-08-24 14:35:11 +02:00
2014-07-20 02:01:50 +02:00
2014-06-03 10:58:19 -08:00
2014-10-18 00:48:49 +02:00
2014-10-22 23:12:38 +02:00
2014-05-28 03:52:50 +02:00
2014-07-17 11:29:01 +02:00