Michael Niedermayer e744e9a305 Merge commit 'ef363ebd59' ... * commit 'ef363ebd59': mp3enc: write full LAME frame Conflicts: libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-10-24 15:30:12 +02:00
..
acodec	adpcm: Write the proper predictor in trellis mode in IMA QT	2014-06-06 17:08:21 +02:00
fate	Added STL demuxer and decoder	2014-10-22 23:12:38 +02:00
lavf	Merge commit 'c2c22c75cf'	2014-10-14 22:03:51 +02:00
lavf-fate	Merge commit 'ef363ebd59'	2014-10-24 15:30:12 +02:00
seek	avcodec/asvenc: fix AAN scaling	2014-09-23 17:04:02 +02:00
vsynth	avcodec/asvenc: fix AAN scaling	2014-09-23 17:04:02 +02:00
vsynth1	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00