Merge commit 'ba13606c'
* 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: Michael Niedermayer <michaelni@gmx.at>
Showing
This diff is collapsed.
This diff is collapsed.
Please
register
or
sign in
to comment