Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'

[ffmpeg] / libavformat / nut.h

diff --git a/libavformat/nut.h b/libavformat/nut.h
index a08d30b93507dd510f6abf3aae0a35ce9a783e70..d7a462ef6f2e1760a0cd0e9e63b3ec6731240d0f 100644 (file)
--- 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;