rmdec: add missing brackets to compound statement

[ffmpeg] / libavformat / nut.h

diff --git a/libavformat/nut.h b/libavformat/nut.h
index 3f09689bd11c2571092a7a61303bebe5a3eb53e3..52ce8fca27a5821f41b40d164c801f463eabe3b6 100644 (file)
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -22,11 +22,8 @@
 #ifndef AVFORMAT_NUT_H
 #define AVFORMAT_NUT_H
 
-//#include <limits.h>
-//#include "libavutil/adler32.h"
-//#include "libavcodec/mpegaudio.h"
 #include "avformat.h"
-#include "riff.h"
+#include "internal.h"
 #include "metadata.h"
 
 #define      MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48))
@@ -39,18 +36,22 @@
 
 #define MAX_DISTANCE (1024*32-1)
 
+#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
-    FLAG_EOR        =   2, ///<if set, stream has no relevance on presentation. (EOR)
-    FLAG_CODED_PTS  =   8, ///<if set, coded_pts is in the frame header
-    FLAG_STREAM_ID  =  16, ///<if set, stream_id is coded in the frame header
-    FLAG_SIZE_MSB   =  32, ///<if set, data_size_msb is at frame header, otherwise data_size_msb is 0
-    FLAG_CHECKSUM   =  64, ///<if set, the frame header contains a checksum
-    FLAG_RESERVED   = 128, ///<if set, reserved_count is coded in the frame header
-    FLAG_HEADER_IDX =1024, ///<If set, header_idx is coded in the frame header.
-    FLAG_MATCH_TIME =2048, ///<If set, match_time_delta is coded in the frame header
-    FLAG_CODED      =4096, ///<if set, coded_flags are stored in the frame header
-    FLAG_INVALID    =8192, ///<if set, frame_code is invalid
+    FLAG_KEY        =   1, // if set, frame is keyframe
+    FLAG_EOR        =   2, // if set, stream has no relevance on presentation. (EOR)
+    FLAG_CODED_PTS  =   8, // if set, coded_pts is in the frame header
+    FLAG_STREAM_ID  =  16, // if set, stream_id is coded in the frame header
+    FLAG_SIZE_MSB   =  32, // if set, data_size_msb is at frame header, otherwise data_size_msb is 0
+    FLAG_CHECKSUM   =  64, // if set, the frame header contains a checksum
+    FLAG_RESERVED   = 128, // if set, reserved_count is coded in the frame header
+    FLAG_HEADER_IDX =1024, // If set, header_idx is coded in the frame header.
+    FLAG_MATCH_TIME =2048, // If set, match_time_delta is coded in the frame header
+    FLAG_CODED      =4096, // if set, coded_flags are stored in the frame header
+    FLAG_INVALID    =8192, // if set, frame_code is invalid
 } Flag;
 
 typedef struct Syncpoint {
@@ -86,13 +87,14 @@ typedef struct ChapterContext {
 } ChapterContext;
 
 typedef struct NUTContext {
+    const AVClass *av_class;
     AVFormatContext *avf;
 //    int written_packet_size;
 //    int64_t packet_start;
     FrameCode frame_code[256];
     uint8_t header_len[128];
     const uint8_t *header[128];
-    uint64_t next_startcode;     ///< stores the next startcode if it has already been parsed but the stream is not seekable
+    uint64_t next_startcode;     // stores the next startcode if it has already been parsed but the stream is not seekable
     StreamContext *stream;
     ChapterContext *chapter;
     unsigned int max_distance;
@@ -101,10 +103,18 @@ typedef struct NUTContext {
     int header_count;
     AVRational *time_base;
     struct AVTreeNode *syncpoints;
+#define NUT_BROADCAST 1 // use extended syncpoints
+#define NUT_PIPE 2      // do not write syncpoints
+    int flags;
+    int version; // version currently in use
 } NUTContext;
 
 extern const AVCodecTag ff_nut_subtitle_tags[];
 extern const AVCodecTag ff_nut_video_tags[];
+extern const AVCodecTag ff_nut_audio_tags[];
+extern const AVCodecTag ff_nut_data_tags[];
+
+extern const AVCodecTag * const ff_nut_codec_tags[];
 
 typedef struct Dispositions {
     char str[9];
@@ -115,7 +125,7 @@ void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val);
 int64_t ff_lsb2full(StreamContext *stream, int64_t lsb);
 int ff_nut_sp_pos_cmp(const Syncpoint *a, const Syncpoint *b);
 int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b);
-void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
+int ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
 void ff_nut_free_sp(NUTContext *nut);
 
 extern const Dispositions ff_nut_dispositions[];