1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Michael Niedermayer 48706f41e1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpeg12: check for available bits to avoid an infinite loop
  fate: add some shorthands to run groups of tests
  fate: Give some tests more sensible names.
  cosmetics: Rename ffsink to avsink.

Conflicts:
	avconv.c
	cmdutils.c
	cmdutils.h
	ffmpeg.c
	ffplay.c
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/dpcm.mak
	tests/fate/image.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak
	tests/fate/pcm.mak
	tests/fate/real.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/fate/voice.mak
	tests/fate/wma.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-20 02:14:54 +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
2012-01-03 23:16:29 +01: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
2012-01-07 11:09:04 -08: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
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
2012-01-13 15:45:30 -05: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
2012-01-09 11:04:17 -08:00
2011-11-23 21:43:46 +01:00
2011-12-15 21:28:54 +01:00
w64
2012-01-08 17:26:24 +01:00
2010-08-28 14:51:51 +00:00
2012-01-08 14:53:35 -08:00
2012-01-08 18:33:59 -08:00
yop
2011-11-12 20:49:53 +01:00