Michael Niedermayer 5b58d79a99 Merge commit '7a1d6ddd2c' ... * commit '7a1d6ddd2c': xvid: Add C IDCT Conflicts: libavcodec/dct-test.c libavcodec/xvididct.c See: 298b3b6c1f Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-09-03 04:09:38 +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 '7a1d6ddd2c'	2014-09-03 04:09:38 +02:00
lavf	avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation	2014-08-09 05:05:09 +02:00
lavf-fate	Merge commit 'b263f8ffe7'	2014-08-25 13:25:09 +02:00
seek	avcodec/roqvideo: use JPEG color range	2014-07-06 23:34:58 +02:00
vsynth	huffyuvdec: decode the last odd sample	2014-08-25 23:24:07 +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