• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 31f3c947
    Michael Niedermayer authored
    * qatar/master:
      fate: fix dependencies on SAMPLES being set
      fate: remove unnecessary libavfilter dependency
    
    Conflicts:
    	ffmpeg.c
    	tests/Makefile
    	tests/fate/aac.mak
    	tests/fate/audio.mak
    	tests/fate/demux.mak
    	tests/fate/ea.mak
    	tests/fate/image.mak
    	tests/fate/lossless-audio.mak
    	tests/fate/lossless-video.mak
    	tests/fate/microsoft.mak
    	tests/fate/mpc.mak
    	tests/fate/probe.mak
    	tests/fate/qt.mak
    	tests/fate/real.mak
    	tests/fate/screen.mak
    	tests/fate/video.mak
    	tests/fate/voice.mak
    	tests/fate/vqf.mak
    	tests/ref/fate/idroq-video-encode
    	tests/ref/fate/vc1-ism
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    31f3c947
h264.mak 35.4 KB