* commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07':
nut: Drop doxygen markers
Conflicts:
libavformat/nut.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
... | ... |
@@ -41,18 +41,18 @@ |
41 | 41 |
#define NUT_MIN_VERSION 2 |
42 | 42 |
|
43 | 43 |
typedef enum{ |
44 |
- FLAG_KEY = 1, ///<if set, frame is keyframe |
|
45 |
- FLAG_EOR = 2, ///<if set, stream has no relevance on presentation. (EOR) |
|
46 |
- FLAG_CODED_PTS = 8, ///<if set, coded_pts is in the frame header |
|
47 |
- FLAG_STREAM_ID = 16, ///<if set, stream_id is coded in the frame header |
|
48 |
- FLAG_SIZE_MSB = 32, ///<if set, data_size_msb is at frame header, otherwise data_size_msb is 0 |
|
49 |
- FLAG_CHECKSUM = 64, ///<if set, the frame header contains a checksum |
|
50 |
- FLAG_RESERVED = 128, ///<if set, reserved_count is coded in the frame header |
|
51 |
- FLAG_SM_DATA = 256, ///<if set, side / meta data is stored in the frame header. |
|
52 |
- FLAG_HEADER_IDX =1024, ///<If set, header_idx is coded in the frame header. |
|
53 |
- FLAG_MATCH_TIME =2048, ///<If set, match_time_delta is coded in the frame header |
|
54 |
- FLAG_CODED =4096, ///<if set, coded_flags are stored in the frame header |
|
55 |
- FLAG_INVALID =8192, ///<if set, frame_code is invalid |
|
44 |
+ FLAG_KEY = 1, // if set, frame is keyframe |
|
45 |
+ FLAG_EOR = 2, // if set, stream has no relevance on presentation. (EOR) |
|
46 |
+ FLAG_CODED_PTS = 8, // if set, coded_pts is in the frame header |
|
47 |
+ FLAG_STREAM_ID = 16, // if set, stream_id is coded in the frame header |
|
48 |
+ FLAG_SIZE_MSB = 32, // if set, data_size_msb is at frame header, otherwise data_size_msb is 0 |
|
49 |
+ FLAG_CHECKSUM = 64, // if set, the frame header contains a checksum |
|
50 |
+ FLAG_RESERVED = 128, // if set, reserved_count is coded in the frame header |
|
51 |
+ FLAG_SM_DATA = 256, // if set, side / meta data is stored in the frame header. |
|
52 |
+ FLAG_HEADER_IDX =1024, // If set, header_idx is coded in the frame header. |
|
53 |
+ FLAG_MATCH_TIME =2048, // If set, match_time_delta is coded in the frame header |
|
54 |
+ FLAG_CODED =4096, // if set, coded_flags are stored in the frame header |
|
55 |
+ FLAG_INVALID =8192, // if set, frame_code is invalid |
|
56 | 56 |
} Flag; |
57 | 57 |
|
58 | 58 |
typedef struct Syncpoint { |
... | ... |
@@ -96,7 +96,7 @@ typedef struct NUTContext { |
96 | 96 |
FrameCode frame_code[256]; |
97 | 97 |
uint8_t header_len[128]; |
98 | 98 |
const uint8_t *header[128]; |
99 |
- uint64_t next_startcode; ///< stores the next startcode if it has already been parsed but the stream is not seekable |
|
99 |
+ uint64_t next_startcode; // stores the next startcode if it has already been parsed but the stream is not seekable |
|
100 | 100 |
StreamContext *stream; |
101 | 101 |
ChapterContext *chapter; |
102 | 102 |
unsigned int max_distance; |