summaryrefslogtreecommitdiff
path: root/tests/fate-run.sh
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-05-29 11:41:55 +0200
committerAnton Khirnov <anton@khirnov.net>2012-07-09 08:22:38 +0200
commit8d18bc550e7dfc62bc872507a02ae2d7827882d6 (patch)
tree278931afa7ebe7354f22860de26cee5ef35d2df0 /tests/fate-run.sh
parent083d0f6be8a22ce936c4be6f17977104e516434f (diff)
fate-run: make avconv() properly deal with multiple inputs.
Diffstat (limited to 'tests/fate-run.sh')
-rwxr-xr-xtests/fate-run.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 5d3ba4dddb..09776d658d 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -75,7 +75,13 @@ probefmt(){
}
avconv(){
- run avconv -nostats -threads $threads -thread_type $thread_type -cpuflags $cpuflags "$@"
+ dec_opts="-threads $threads -thread_type $thread_type"
+ avconv_args="-nostats -cpuflags $cpuflags"
+ for arg in $@; do
+ [ ${arg} = -i ] && avconv_args="${avconv_args} ${dec_opts}"
+ avconv_args="${avconv_args} ${arg}"
+ done
+ run avconv ${avconv_args}
}
framecrc(){