1. 20 Jan, 2012 1 commit
    • 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
  2. 19 Jan, 2012 16 commits
  3. 18 Jan, 2012 20 commits
  4. 17 Jan, 2012 3 commits