generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/nut: add minor_version field with version>=4

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-23 03:25:25 +01:00
parent 6aa50374bf
commit 804ea14b35
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/nut.h
View File

@ -105,6 +105,7 @@ typedef struct NUTContext {
int64_t max_pts; int64_t max_pts;
AVRational *max_pts_tb; AVRational *max_pts_tb;
int version; int version;
int minor_version;
} NUTContext; } NUTContext;
extern const AVCodecTag ff_nut_subtitle_tags[]; extern const AVCodecTag ff_nut_subtitle_tags[];

2
libavformat/nutdec.c
View File

@ -233,6 +233,8 @@ static int decode_main_header(NUTContext *nut)
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
nut->version = tmp; nut->version = tmp;
if (nut->version > 3)
nut->minor_version = ffio_read_varlen(bc);
GET_V(stream_count, tmp > 0 && tmp <= NUT_MAX_STREAMS); GET_V(stream_count, tmp > 0 && tmp <= NUT_MAX_STREAMS);

2
libavformat/nutenc.c
View File

@ -338,6 +338,8 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc)
int64_t tmp_match; int64_t tmp_match;
ff_put_v(bc, nut->version = NUT_VERSION); ff_put_v(bc, nut->version = NUT_VERSION);
if (nut->version > 3)
ff_put_v(bc, nut->minor_version);
ff_put_v(bc, nut->avf->nb_streams); ff_put_v(bc, nut->avf->nb_streams);
ff_put_v(bc, nut->max_distance); ff_put_v(bc, nut->max_distance);
ff_put_v(bc, nut->time_base_count); ff_put_v(bc, nut->time_base_count);