virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

nut: use a define for the nut version

Browse Source 
Ease switching version in the future and make evident why that value.
This commit is contained in:
Luca Barbato 2013-05-04 12:47:15 +02:00
parent 2d5fd7886a
commit 46c1917350
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/nut.h
View File

@ -39,6 +39,8 @@
#define MAX_DISTANCE (1024*32-1) #define MAX_DISTANCE (1024*32-1)
#define NUT_VERSION 3
typedef enum{ typedef enum{
FLAG_KEY = 1, ///<if set, frame is keyframe FLAG_KEY = 1, ///<if set, frame is keyframe
FLAG_EOR = 2, ///<if set, stream has no relevance on presentation. (EOR) FLAG_EOR = 2, ///<if set, stream has no relevance on presentation. (EOR)

2
libavformat/nutdec.c
View File

@ -213,7 +213,7 @@ static int decode_main_header(NUTContext *nut)
end = get_packetheader(nut, bc, 1, MAIN_STARTCODE); end = get_packetheader(nut, bc, 1, MAIN_STARTCODE);
end += avio_tell(bc); end += avio_tell(bc);
GET_V(tmp, tmp >= 2 && tmp <= 3); GET_V(tmp, tmp >= 2 && tmp <= NUT_VERSION);
GET_V(stream_count, tmp > 0 && tmp <= NUT_MAX_STREAMS); GET_V(stream_count, tmp > 0 && tmp <= NUT_MAX_STREAMS);
nut->max_distance = ffio_read_varlen(bc); nut->max_distance = ffio_read_varlen(bc);

2
libavformat/nutenc.c
View File

@ -323,7 +323,7 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc)
tmp_head_idx; tmp_head_idx;
int64_t tmp_match; int64_t tmp_match;
ff_put_v(bc, 3); /* version */ ff_put_v(bc, NUT_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);