• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 48706f41
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    48706f41
Name
Last commit
Last update
..
acodec Loading commit data...
fate Loading commit data...
lavf Loading commit data...
lavfi Loading commit data...
seek Loading commit data...
vsynth1 Loading commit data...
vsynth2 Loading commit data...