Disable the NUT (de)muxer until it has been synced with the specification.

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

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 7d2241447c323f246c8653bfa50e17da52a5563f..1228020b6902e5cf1396f85ef30cf7efd7bb8e69 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -110,7 +110,9 @@ 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 aebe96376873a36ea009087267d6d685f28f0410..b9f23c66cfcc460303a96d954129697a6683cd24 100644 (file)
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -25,9 +25,6 @@ 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 2df2d8044f3ef03b7d870fe609162e426d5b23ba..20ac71f9b02bb11a7f9bc2f9fee35b44a796ba24 100755 (executable)
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -632,10 +632,11 @@ 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