diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:17:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:25:37 +0200 |
| commit | 1f5e5d2205df568f86371660b0991ec7087e94e6 (patch) | |
| tree | de4e14688195143baab7988797d3329904a92ee4 /tests/fate.sh | |
| parent | e755c8ac462e85e6c3de4f0207dc6bb5c86409cf (diff) | |
| parent | ba13606ca6adbc74b4db4a72b0769397d6408791 (diff) | |
| download | ffmpeg-streaming-1f5e5d2205df568f86371660b0991ec7087e94e6.zip ffmpeg-streaming-1f5e5d2205df568f86371660b0991ec7087e94e6.tar.gz | |
Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'
* commit 'ba13606ca6adbc74b4db4a72b0769397d6408791':
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>
Diffstat (limited to 'tests/fate.sh')
| -rwxr-xr-x | tests/fate.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/fate.sh b/tests/fate.sh index 33710e0..ecbb16d 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -55,6 +55,7 @@ configure()( ${sysroot:+--sysroot="$sysroot"} \ ${target_exec:+--target-exec="$target_exec"} \ ${target_path:+--target-path="$target_path"} \ + ${target_samples:+--target-samples="$target_samples"} \ ${extra_cflags:+--extra-cflags="$extra_cflags"} \ ${extra_ldflags:+--extra-ldflags="$extra_ldflags"} \ ${extra_libs:+--extra-libs="$extra_libs"} \ |
