1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
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
..
2011-12-13 15:46:23 +01:00
amv
2011-06-30 09:47:32 +01:00
caf
2011-12-28 22:05:24 +01:00
crc
2011-07-03 17:17:54 +01:00
2011-11-23 21:43:46 +01:00
dpx
2011-12-17 15:49:25 +00:00
2010-08-28 11:46:03 +00:00
2010-08-28 11:46:03 +00:00
2011-11-23 21:43:46 +01:00
2011-11-09 00:06:08 +01:00
2011-10-18 10:45:22 +03:00
2011-07-04 16:26:26 +01:00
md5
2011-07-03 18:19:18 +01:00
2010-08-31 11:13:14 +00:00
2011-11-23 21:43:46 +01:00
2010-07-17 10:50:25 +00:00
2010-04-19 11:51:40 +00:00
2011-12-07 21:11:51 +01:00
2011-12-15 14:34:09 +01:00
rl2
2011-08-17 15:00:42 +02:00
sha
2010-08-31 20:07:38 +00:00
2011-09-14 11:13:54 +03:00
smc
2011-01-14 22:32:26 +00:00
2010-12-28 23:52:53 +00:00
2011-11-23 21:43:46 +01:00
tmv
2011-11-23 21:43:46 +01:00
2011-09-07 12:16:15 +02:00
2011-12-03 01:50:07 +01:00
2011-11-23 21:43:46 +01:00
vp3
2010-08-25 17:23:38 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2011-12-15 21:28:54 +01:00
w64
2010-08-28 14:51:51 +00:00
yop
2011-11-12 20:49:53 +01:00