summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-03-18 22:54:44 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-03-18 22:54:44 +0000
commit74d69c0719eeff2dbe1168b0b2208dd4d1ba5c25 (patch)
treee0e9bd29cb414af37cad410ff8869f21f261bf24 /tests
parent458eaddad164570f9a1a88d47b933c8dd50d24e2 (diff)
enable .ffm regression test as it works again
Originally committed as revision 2907 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/libav.regression.ref2
-rwxr-xr-xtests/regression.sh6
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 84cdfccbe5..1fe7e8d26f 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -8,6 +8,8 @@ be8eb1b5705c8105e4727258e448cb24 *./data/b-libav.rm
./data/b-libav.mpg CRC=eda0e29e
01a4130e776b8955fa99e477113e94fd *./data/b-libav.swf
./data/b-libav.swf CRC=eaaf4640
+f13889dd08a4968e2b783771c7a29229 *./data/b-libav.ffm
+./data/b-libav.ffm CRC=94c26232
9d1a1e4d23f16ecee9ad46f913acbbe0 *./data/b-libav.flv
./data/b-libav.flv CRC=8a731c32
2759fdd5f1014abfefe36376649c9c90 *./data/b-libav.mov
diff --git a/tests/regression.sh b/tests/regression.sh
index 981a764f56..6970649f33 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -461,9 +461,9 @@ do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src -a
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
-#do_ffmpeg_crc $file -i $file
+file=${outfile}libav.ffm
+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
# flv
file=${outfile}libav.flv