diff options
| author | Oded Shimon <ods15@ods15.dyndns.org> | 2008-02-04 10:34:35 +0000 |
|---|---|---|
| committer | Oded Shimon <ods15@ods15.dyndns.org> | 2008-02-04 10:34:35 +0000 |
| commit | 82badd27f165e9002b97402a71c0aa5d6e248d3e (patch) | |
| tree | e0131bdf67fc618e3f03cd409d9e230d0aa6a522 | |
| parent | eae213af43a3db24720d6df6b543224b7dce1fd3 (diff) | |
| download | ffmpeg-82badd27f165e9002b97402a71c0aa5d6e248d3e.tar.gz | |
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
| -rw-r--r-- | libavformat/nutenc.c | 3 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index bd326bca67..a8a431fc22 100644 --- 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 fa9bf772b5..ac69ea1932 100644 --- 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 |