[FFmpeg-cvslog] avformat/nut: store version in the context

Michael Niedermayer git at videolan.org
Wed Dec 25 02:43:54 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 23 03:25:24 2013 +0100| [6aa50374bf27f5a7cbb023e64699a26ea619cf88] | committer: Michael Niedermayer

avformat/nut: store version in the context

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6aa50374bf27f5a7cbb023e64699a26ea619cf88
---

 libavformat/nut.h    |    1 +
 libavformat/nutdec.c |    1 +
 libavformat/nutenc.c |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/nut.h b/libavformat/nut.h
index da456ac..88b24e5 100644
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -104,6 +104,7 @@ typedef struct NUTContext {
     int sp_count;
     int64_t max_pts;
     AVRational *max_pts_tb;
+    int version;
 } NUTContext;
 
 extern const AVCodecTag ff_nut_subtitle_tags[];
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index aa7ca67..26c6f0d 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -232,6 +232,7 @@ static int decode_main_header(NUTContext *nut)
                tmp);
         return AVERROR(ENOSYS);
     }
+    nut->version = tmp;
 
     GET_V(stream_count, tmp > 0 && tmp <= NUT_MAX_STREAMS);
 
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index f2172fb..bee1fbe 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -337,7 +337,7 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc)
         tmp_head_idx;
     int64_t tmp_match;
 
-    ff_put_v(bc, NUT_VERSION);
+    ff_put_v(bc, nut->version = NUT_VERSION);
     ff_put_v(bc, nut->avf->nb_streams);
     ff_put_v(bc, nut->max_distance);
     ff_put_v(bc, nut->time_base_count);



More information about the ffmpeg-cvslog mailing list