diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
| commit | f7813a5324be39d13ab536c245d15dfc602a7849 (patch) | |
| tree | fad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavformat/nut.h | |
| parent | b7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff) | |
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavformat/nut.h')
| -rw-r--r-- | ffmpeg/libavformat/nut.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ffmpeg/libavformat/nut.h b/ffmpeg/libavformat/nut.h index ab31c27..18b688a 100644 --- a/ffmpeg/libavformat/nut.h +++ b/ffmpeg/libavformat/nut.h @@ -22,9 +22,6 @@ #ifndef AVFORMAT_NUT_H #define AVFORMAT_NUT_H -//#include <limits.h> -//#include "libavutil/adler32.h" -//#include "libavcodec/mpegaudio.h" #include "avformat.h" #include "internal.h" #include "metadata.h" @@ -39,6 +36,8 @@ #define MAX_DISTANCE (1024*32-1) +#define NUT_VERSION 3 + typedef enum{ FLAG_KEY = 1, ///<if set, frame is keyframe FLAG_EOR = 2, ///<if set, stream has no relevance on presentation. (EOR) @@ -105,6 +104,8 @@ typedef struct NUTContext { int sp_count; int64_t max_pts; AVRational *max_pts_tb; + int version; + int minor_version; } NUTContext; extern const AVCodecTag ff_nut_subtitle_tags[]; @@ -123,7 +124,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[]; |