generate MPEG elementary streams in all cases - added interlaced MPEG2 test

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

3 files changed, 20 insertions, 7 deletions

diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index ebac72bcfa..cc6738eb1f 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -2,9 +2,12 @@ ffmpeg regression test
 74e25b401f34321aeb854e264ef62df8 *./data/a-mpeg1.mpg
 6713259d72260740bbddaea30631ea18 *./data/out.yuv
 stddev:  7.58 bytes:7299072
-059aa59cb848fc278b278f816400d2bb *./data/a-mpeg2.vob
+b588110bebb48b5a1815ac26d0f0c9cc *./data/a-mpeg2.mpg
 0f3dbc8ee895c7853e06b8dec279c666 *./data/out.yuv
 stddev:  7.62 bytes:7299072
+345b79f7afe43abc0128a7b1d5fff949 *./data/a-mpeg2i.mpg
+80d2f03a4ace66c734e8d33ffd27e88d *./data/out.yuv
+stddev:  7.93 bytes:7299072
 d0dc46dd831398237a690ebbeff18b64 *./data/a-msmpeg4v2.avi
 712aa6c959d1d90a78fe98657cbff19c *./data/out.yuv
 stddev:  8.11 bytes:7602176
@@ -35,7 +38,7 @@ stddev: 10.18 bytes:7145472
 b3f1425e266569d5d726b88eadc13dd4 *./data/a-mpeg4-adv.avi
 fb61365b22c947adbaeab74478579020 *./data/out.yuv
 stddev:  7.31 bytes:7602176
-eeca82dbf25257928663261428960710 *./data/a-mpeg1b.mpg
+328ebd044362116e274739e23c482ee7 *./data/a-mpeg1b.mpg
 41b3baa7d8c17202e6577947ac37cad0 *./data/out.yuv
 stddev:  6.32 bytes:6842368
 07042f42b3119c39eb26537a84a451df *./data/a-mjpeg.avi
diff --git a/tests/regression.sh b/tests/regression.sh
index 89d8a66c6a..d410da3a30 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -129,8 +129,15 @@ fi
 ###################################
 if [ -n "$do_mpeg2" ] ; then
 # mpeg2 encoding
-file=${outfile}mpeg2.vob
-do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video $file 
+file=${outfile}mpeg2.mpg
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1video $file 
+
+# mpeg2 decoding
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+
+# mpeg2 encoding interlaced
+file=${outfile}mpeg2i.mpg
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1video -interlace $file 
 
 # mpeg2 decoding
 do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
@@ -240,7 +247,7 @@ fi
 if [ -n "$do_mpeg1b" ] ; then
 # mpeg1
 file=${outfile}mpeg1b.mpg
-do_ffmpeg $file -y -qscale 8 -bf 3 -ps 200 -f pgmyuv -i $raw_src -an -vcodec mpeg1video $file
+do_ffmpeg $file -y -qscale 8 -bf 3 -ps 200 -f pgmyuv -i $raw_src -an -vcodec mpeg1video -f mpeg1video $file
 
 # mpeg1 decoding
 do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst 
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index b1d625f3b4..f5f2a09fdd 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -2,9 +2,12 @@ ffmpeg regression test
 a6ccb5e768c7bed7a08f8e4343d81871 *./data/a-mpeg1.mpg
 0cf790edd0f4c5cf993c2d59211b9de2 *./data/out.yuv
 stddev:  4.91 bytes:7299072
-37762c54fafba01dd08ce4584b92b850 *./data/a-mpeg2.vob
+aa0f088777131d8ffb627e6ff37312ca *./data/a-mpeg2.mpg
 e32c521f104a6e11b26a6165bcad33f7 *./data/out.yuv
 stddev:  4.93 bytes:7299072
+ed480119089c61ba5a5a8668675c7d49 *./data/a-mpeg2i.mpg
+d3d02a8353dcc669c45529c96f92bee9 *./data/out.yuv
+stddev:  4.94 bytes:7299072
 14db391f167b52b21a983157b410affc *./data/a-msmpeg4v2.avi
 fc8881e0904af9491d5fa0163183954b *./data/out.yuv
 stddev:  5.29 bytes:7602176
@@ -35,7 +38,7 @@ stddev:  4.20 bytes:7145472
 742ffadf3c309d2c4ac888a6a0905bf9 *./data/a-mpeg4-adv.avi
 b02f71e91e9368ce94814ab3d74f91ba *./data/out.yuv
 stddev:  4.97 bytes:7602176
-f68c426a1ccb7e1e7e0a76ebf01c8860 *./data/a-mpeg1b.mpg
+671802a2c5078e69f7f422765ea87f2a *./data/a-mpeg1b.mpg
 71e80b8ff8da567f1bbff000cd925627 *./data/out.yuv
 stddev:  4.07 bytes:6842368
 e9218a1db885fe0262e88f9df630307d *./data/a-mjpeg.avi