summaryrefslogtreecommitdiff
path: root/tests/regression.sh
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2007-01-14 23:55:54 +0000
committerMåns Rullgård <mans@mansr.com>2007-01-14 23:55:54 +0000
commit45ddd8b02131513a792ff78f6cbefd4f63934d57 (patch)
tree20d7fff120195919e588211ca69310c72c3954b3 /tests/regression.sh
parentac66834c759b7130fb5be51f63cb6dff9b294cba (diff)
merge fragmented mpeg4adv section in regression.sh
Originally committed as revision 7519 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests/regression.sh')
-rwxr-xr-xtests/regression.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/regression.sh b/tests/regression.sh
index c94bc05ca2..f032255375 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -352,19 +352,16 @@ do_video_decoding
# mpeg4
do_video_encoding mpeg4-adap.avi "-b 550k -bf 2 -flags +mv4+trell+mv0 -cmp 1 -subcmp 2 -mbd rd -scplx_mask 0.3" pgmyuv "-an -vcodec mpeg4"
do_video_decoding
-fi
-###################################
-if [ -n "$do_mpeg4thread" ] ; then
# mpeg4
-do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic+trell -mbd bits -ps 200 -bf 2" pgmyuv "-an -vcodec mpeg4 -threads 2"
+do_video_encoding mpeg4-Q.avi "-qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1 -subcmp 2" pgmyuv "-an -vcodec mpeg4"
do_video_decoding
fi
###################################
-if [ -n "$do_mpeg4adv" ] ; then
+if [ -n "$do_mpeg4thread" ] ; then
# mpeg4
-do_video_encoding mpeg4-Q.avi "-qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1 -subcmp 2" pgmyuv "-an -vcodec mpeg4"
+do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic+trell -mbd bits -ps 200 -bf 2" pgmyuv "-an -vcodec mpeg4 -threads 2"
do_video_decoding
fi