mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
7dc0ed80e8
* commit '1f3f896564501c23b44fcf605567c78ce066b539': 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: Michael Niedermayer <michaelni@gmx.at>