1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/tools
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
..
build_libstagefright
clean-diff
cws2fws.c tests/tools/examples: Replace direct exit() calls by return. 2011-12-08 01:00:58 +01:00
enum_options.c
graph2dot.c
lavfi-showfiltfmts.c
patcheck Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
pktdumper.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
probetest.c
qt-faststart.c Merge remote-tracking branch 'qatar/master' 2011-12-31 01:16:45 +01:00
trasher.c
unwrap-diff