Reenable NUT and NUT regression tests as requested by Michael.

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

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 1228020..7d22414 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -110,9 +110,7 @@ void av_register_all(void)
     dc1394_init();
 #endif
 
-    /* Reenable when the (de)muxer has been synced with the specification.
     nut_init();
-    */
     matroska_init();
     sol_init();
     ea_init();

diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index b9f23c6..aebe963 100644 (file)
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -25,6 +25,9 @@ c9050b51f6d6636cdda3160d43463bc3 *./data/b-libav.ts
 63e05396e2d52135c4025ce14eb090a9 *./data/b-libav.mov
 369893 ./data/b-libav.mov
 ./data/b-libav.mov CRC=0x48f5a90d
+8bf16d40a2ec19fa36b124a928e47e23 *./data/b-libav.nut
+ 332358 ./data/b-libav.nut
+./data/b-libav.nut CRC=0xccab3a27
 2cc647904d3cca01703f36056b9d3f42 *./data/b-libav.dv
 3600000 ./data/b-libav.dv
 ./data/b-libav.dv CRC=0xa6b8b635

diff --git a/tests/regression.sh b/tests/regression.sh
index 20ac71f..2df2d80 100755 (executable)
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -632,11 +632,10 @@ file=${outfile}libav.mov
 do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src -acodec pcm_alaw $file
 do_ffmpeg_crc $file -i $file
 
-# Reenable when the (de)muxer has been synced with the specification.
 # nut
-#file=${outfile}libav.nut
-#do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src -acodec mp2 $file
-#do_ffmpeg_crc $file -i $file
+file=${outfile}libav.nut
+do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src -acodec mp2 $file
+do_ffmpeg_crc $file -i $file
 
 # dv
 file=${outfile}libav.dv