reactivated swf/mjpeg/jpg formats testing

Originally committed as revision 600 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 9 insertions, 7 deletions

diff --git a/tests/regression.sh b/tests/regression.sh
index a3e2c41c7c..a1cd1a3e5f 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -175,15 +175,13 @@ do_ffmpeg_crc $file -i $file
 
 # swf (decode audio only)
 file=${outfile}libav.swf
-# broken
-#do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file
-#do_ffmpeg_crc $file -i $file
+do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file
+do_ffmpeg_crc $file -i $file
 
 # ffm
 file=${outfile}libav.ffm
 do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file
-# broken
-#do_ffmpeg_crc $file -i $file
+do_ffmpeg_crc $file -i $file
 
 # XXX: need mov and mpegts tests (add bitstreams or add output capability in ffmpeg)
 
@@ -192,8 +190,7 @@ do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $f
 # mjpeg
 file=${outfile}libav.mjpeg
 do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file
-# broken
-#do_ffmpeg_crc $file -i $file
+do_ffmpeg_crc $file -i $file
 
 # pgmpipe
 file=${outfile}libav.pgmpipe
@@ -222,6 +219,11 @@ file=${outfile}libav%d.ppm
 $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $file
 do_ffmpeg_crc $file -i $file
 
+# jpeg (we do not do md5 on image files yet)
+file=${outfile}libav%d.jpg
+$ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $file
+do_ffmpeg_crc $file -i $file
+
 ####################
 # audio only