Revert the merger of LC_ALL declaration and export.

[ffmpeg] / libavformat / nut.h

diff --git a/libavformat/nut.h b/libavformat/nut.h
index 3507ced26d81ced4a71eda8cd89630d1684a26da..713d27dd3ba9bad23751d0ed7f09c5146a3bf98d 100644 (file)
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -23,11 +23,10 @@
 #define AVFORMAT_NUT_H
 
 //#include <limits.h>
+//#include "libavutil/adler32.h"
+//#include "libavcodec/mpegaudio.h"
 #include "avformat.h"
-#include "crc.h"
-//#include "mpegaudio.h"
 #include "riff.h"
-//#include "adler32.h"
 
 #define      MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48))
 #define    STREAM_STARTCODE (0x11405BF2F9DBULL + (((uint64_t)('N'<<8) + 'S')<<48))
@@ -47,6 +46,8 @@ typedef enum{
     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_t;
@@ -65,6 +66,7 @@ typedef struct {
     uint16_t size_lsb;
     int16_t  pts_delta;
     uint8_t  reserved_count;
+    uint8_t  header_idx;
 } FrameCode; // maybe s/FrameCode/framecode_t/ or change all to Java style but do not mix
 
 typedef struct {
@@ -83,6 +85,8 @@ typedef struct {
 //    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
     StreamContext *stream;
     unsigned int max_distance;
@@ -93,11 +97,19 @@ typedef struct {
     struct AVTreeNode *syncpoints;
 } NUTContext;
 
-unsigned long av_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, unsigned int len);
+extern const AVCodecTag ff_nut_subtitle_tags[];
+
+typedef struct {
+    char str[9];
+    int flag;
+} Dispositions;
+
 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(syncpoint_t *a, syncpoint_t *b);
 int ff_nut_sp_pts_cmp(syncpoint_t *a, syncpoint_t *b);
 void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
 
+extern const Dispositions ff_nut_dispositions[];
+
 #endif /* AVFORMAT_NUT_H */