Michael Niedermayer a708689fda Merge commit 'f29c226af0' ... * commit 'f29c226af0': fate: add mpeg4 tests for frame size changes Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-10-17 12:59:07 +02:00
..
acodec	adpcm: Write the proper predictor in trellis mode in IMA QT	2014-06-06 17:08:21 +02:00
fate	Merge commit 'f29c226af0'	2014-10-17 12:59:07 +02:00
lavf	Merge commit 'c2c22c75cf'	2014-10-14 22:03:51 +02:00
lavf-fate	Merge commit 'b263f8ffe7'	2014-08-25 13:25:09 +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
vsynth2