nut->max_distance was not set at all anywhere in the NUT muxer

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

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index bd326bc..a8a431f 100644 (file)
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -216,7 +216,7 @@ static void write_mainheader(NUTContext *nut, ByteIOContext *bc){
 
     put_v(bc, 3); /* version */
     put_v(bc, nut->avf->nb_streams);
-    put_v(bc, MAX_DISTANCE);
+    put_v(bc, nut->max_distance);
     put_v(bc, nut->time_base_count);
 
     for(i=0; i<nut->time_base_count; i++){
@@ -418,6 +418,7 @@ static int write_header(AVFormatContext *s){
         nut->stream[i].max_pts_distance= FFMAX(1/av_q2d(time_base), 1);
     }
 
+    nut->max_distance = MAX_DISTANCE;
     build_frame_code(s);
     assert(nut->frame_code['N'].flags == FLAG_INVALID);
 

diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index fa9bf77..ac69ea1 100644 (file)
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -30,8 +30,8 @@ f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv
 2ba41cf880aa5cb87e8a08fdb735398d *./tests/data/b-libav.gxf
 814640 ./tests/data/b-libav.gxf
 ./tests/data/b-libav.gxf CRC=0xa376c09e
-79d92ebd1e760575136fb5f0782d5151 *./tests/data/b-libav.nut
-331022 ./tests/data/b-libav.nut
+5b6d03cfa8ccb701bec3c0f0e562e0da *./tests/data/b-libav.nut
+330100 ./tests/data/b-libav.nut
 ./tests/data/b-libav.nut CRC=0x400c29e9
 43238b15f1012aa27536c2be20bb2383 *./tests/data/b-libav.mkv
 329854 ./tests/data/b-libav.mkv