• Michael Niedermayer's avatar
    Merge commit 'ba13606c' · 1f5e5d22
    Michael Niedermayer authored
    * commit 'ba13606c':
      fate: Add a --target-samples path parameter
    
    Conflicts:
    	configure
    	tests/fate/audio.mak
    	tests/fate/cover-art.mak
    	tests/fate/demux.mak
    	tests/fate/ea.mak
    	tests/fate/filter-video.mak
    	tests/fate/h264.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/prores.mak
    	tests/fate/qt.mak
    	tests/fate/real.mak
    	tests/fate/screen.mak
    	tests/fate/video.mak
    	tests/fate/voice.mak
    	tests/fate/vpx.mak
    	tests/fate/vqf.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    1f5e5d22
video.mak 13.1 KB