Add support for track numbers when they are set via strings

[ffmpeg] / libavformat / nut.h

diff --git a/libavformat/nut.h b/libavformat/nut.h
index af42a57720f8b624489dd086446e0ba74b425f30..1a4473789cca62175c006622ab43ba652a4f3dd6 100644 (file)
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -50,9 +50,10 @@ typedef enum{
 }flag_t;
 
 typedef struct {
-    uint32_t pos; //64gb limit if div16 (change this to 64 if thats too little)
-    uint64_t global_key_pts;
-    uint32_t back_ptr_div16; //is stored /16
+    uint64_t pos;
+    uint64_t back_ptr;
+//    uint64_t global_key_pts;
+    int64_t ts;
 } syncpoint_t;
 
 typedef struct {
@@ -62,10 +63,11 @@ typedef struct {
     uint16_t size_lsb;
     int16_t  pts_delta;
     uint8_t  reserved_count;
-} FrameCode; // maybe s/FrameCode/framecode_t/ or change all to java style but dont mix
+} FrameCode; // maybe s/FrameCode/framecode_t/ or change all to Java style but do not mix
 
 typedef struct {
-    int last_key_frame;  ///<was the last frame a keyfraeme
+    int last_flags;
+    int skip_until_key_frame;
     int64_t last_pts;
     int time_base_id;
     AVRational time_base;
@@ -79,12 +81,13 @@ typedef struct {
 //    int written_packet_size;
 //    int64_t packet_start[3]; //0-> startcode less, 1-> short startcode 2-> long startcodes
     FrameCode frame_code[256];
-    uint64_t next_startcode;     ///< stores the next startcode if it has alraedy been parsed but the stream isnt seekable
+    uint64_t next_startcode;     ///< stores the next startcode if it has already been parsed but the stream is not seekable
     StreamContext *stream;
     unsigned int max_distance;
     unsigned int time_base_count;
     int64_t last_syncpoint_pos;
     AVRational *time_base;
+    struct AVTreeNode *syncpoints;
 } NUTContext;