Fixes for third argument do_image_formats.
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sat, 7 Apr 2012 19:31:11 +0000 (21:31 +0200)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sun, 8 Apr 2012 00:43:56 +0000 (02:43 +0200)
Remove it from two places where it is useless, do not apply
it to the encode command and make it apply to the output
instead of the input of the decode command.
Should fix the dpx test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
tests/lavf-regression.sh

index 9d450da..fcb8794 100755 (executable)
@@ -50,9 +50,9 @@ do_image_formats()
     outfile="$datadir/images/$1/"
     mkdir -p "$outfile"
     file=${outfile}%02d.$1
-    run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS $3 -t 0.5 -y -qscale 10 $target_path/$file
+    run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS -t 0.5 -y -qscale 10 $target_path/$file
     do_md5sum ${outfile}02.$1
-    do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
+    do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
     wc -c ${outfile}02.$1
 }
 
@@ -213,7 +213,7 @@ do_image_formats sgi
 fi
 
 if [ -n "$do_jpg" ] ; then
-do_image_formats jpg "-pix_fmt yuvj420p" "-f image2"
+do_image_formats jpg "-pix_fmt yuvj420p"
 fi
 
 if [ -n "$do_pam" ] ; then
@@ -226,7 +226,7 @@ fi
 
 if [ -n "$do_dpx" ] ; then
 do_image_formats dpx
-do_image_formats dpx "-pix_fmt rgb48le" "-pix_fmt rgb48le"
+do_image_formats dpx "-pix_fmt rgb48le"
 do_image_formats dpx "-pix_fmt rgb48le -bits_per_raw_sample 10" "-pix_fmt rgb48le"
 fi