diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 01:09:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 01:13:59 +0200 |
| commit | a8499cbbe87d00456c391f41207e1981bd7f746a (patch) | |
| tree | fdfc491b412384196ec02fcf305db586a92d2c83 /libavformat/nut.h | |
| parent | d858ee717bed6307b8e772bd5039ab001aeae03f (diff) | |
| parent | c94e2e85cb6af8a570d8542a830556243bd32873 (diff) | |
| download | ffmpeg-a8499cbbe87d00456c391f41207e1981bd7f746a.tar.gz | |
Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'
* commit 'c94e2e85cb6af8a570d8542a830556243bd32873':
nut: Support experimental NUT 4 features
Conflicts:
doc/nut.texi
libavformat/nut.h
libavformat/nutdec.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nut.h')
| -rw-r--r-- | libavformat/nut.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavformat/nut.h b/libavformat/nut.h index a08d30b935..d7a462ef6f 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -36,7 +36,9 @@ #define MAX_DISTANCE (1024*32-1) -#define NUT_VERSION 3 +#define NUT_MAX_VERSION 4 +#define NUT_STABLE_VERSION 3 +#define NUT_MIN_VERSION 2 typedef enum{ FLAG_KEY = 1, ///<if set, frame is keyframe @@ -87,6 +89,7 @@ typedef struct ChapterContext { } ChapterContext; typedef struct NUTContext { + const AVClass *av_class; AVFormatContext *avf; // int written_packet_size; // int64_t packet_start; @@ -105,7 +108,10 @@ typedef struct NUTContext { int sp_count; int64_t max_pts; AVRational *max_pts_tb; - int version; +#define NUT_BROADCAST 1 // use extended syncpoints +#define NUT_PIPE 2 // do not write syncpoints + int flags; + int version; // version currently in use int minor_version; } NUTContext; |