[FFmpeg-cvslog] fate-run: make avconv() properly deal with multiple inputs.

Anton Khirnov git at videolan.org
Mon Jul 9 22:43:09 CEST 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue May 29 11:41:55 2012 +0200| [8d18bc550e7dfc62bc872507a02ae2d7827882d6] | committer: Anton Khirnov

fate-run: make avconv() properly deal with multiple inputs.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d18bc550e7dfc62bc872507a02ae2d7827882d6
---

 tests/fate-run.sh |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 5d3ba4d..09776d6 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(){



More information about the ffmpeg-cvslog mailing list