• Michael Niedermayer's avatar
    Merge commit '1f3f8965' · 7dc0ed80
    Michael Niedermayer authored
    * commit '1f3f8965':
      fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests
      fate: real: Add dependencies
      fate: lossless-audio: Add dependencies
      x86: h264dsp: Fix linking with yasm and optimizations disabled
    
    Conflicts:
    	libavcodec/x86/h264dsp_init.c
    	tests/fate/lossless-audio.mak
    	tests/fate/real.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7dc0ed80
prores.mak 1.1 KB