1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/tests/ref
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
..
acodec Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
fate Merge remote-tracking branch 'qatar/master' 2012-01-20 02:14:54 +01:00
lavf dpxenc: Dont store lavc indent when bitexact is set. 2012-01-17 01:37:59 +01:00
lavfi Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
seek mxfdec: Hybrid demuxing/seeking solution 2011-12-16 11:54:03 +01:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00