ffmpeg/tests/ref
Michael Niedermayer 1a6a088f7c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: whitespace cosmetics
  fate: split off video codec FATE tests into their own file
  fate: split off audio codec FATE tests into their own file
  fate: split off Electronic Arts codec FATE tests into their own file
  fate: split off QuickTime codec FATE tests into their own file
  fate: split off voice codec FATE tests into their own file
  fate: split off demuxer FATE tests into their own file
  cosmetics: Drop unnecessary parentheses around return values.
  fate: drop pointless _audio and _video suffixes from xan tests
  qt-faststart: K&R reformatting; fix comment typos
  FATE: Add test for H.264 MP4->annex.B bitstream filter.

Conflicts:
	ffplay.c
	tests/fate.mak
	tests/fate/h264.mak
	tests/fate/image.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/qtrle.mak
	tests/fate/real.mak
	tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-31 01:16:45 +01:00
..
acodec movenc: disable iods by default 2011-12-16 03:50:19 +01:00
fate Merge remote-tracking branch 'qatar/master' 2011-12-31 01:16:45 +01:00
lavf lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
lavfi Merge remote-tracking branch 'qatar/master' 2011-12-21 03:40:53 +01:00
seek mxfdec: Hybrid demuxing/seeking solution 2011-12-16 11:54:03 +01:00
vsynth1 cljrdec: improve scaling somewhat 2011-12-28 22:05:24 +01:00
vsynth2 cljrdec: improve scaling somewhat 2011-12-28 22:05:24 +01:00