diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 20:33:12 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 20:33:12 +0400 |
commit | 835fd779a46d14d6999618546a9833b3f2af2326 (patch) | |
tree | 5dc4b149f00fb880708bb2267fe004356a555072 /tests | |
parent | fc1152de410323cf41dedd0bf301a6a265b0850f (diff) | |
parent | da025d115a1ada58081cd869e85b81a1c183ae9e (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: workaround for slighly broken 'test' shell builtin
mimic: initialize padding of swap_buf through av_fast_padded_malloc
eamad: initialize padding of bitstream_buf through av_fast_padded_malloc()
raw demuxer: initialize end of partial packets
Conflicts:
tests/fate-run.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/fate-run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 1945d88a23..9cd872b6c6 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -78,7 +78,7 @@ ffmpeg(){ dec_opts="-threads $threads -thread_type $thread_type" ffmpeg_args="-nostats -cpuflags $cpuflags" for arg in $@; do - [ ${arg} = -i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}" + [ x${arg} = x-i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}" ffmpeg_args="${ffmpeg_args} ${arg}" done run ffmpeg ${ffmpeg_args} |