From 90c2295b24e9fa0c857e459088d18945a6681ef0 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Fri, 7 Mar 2008 19:25:09 +0000 Subject: Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing of matroska and nut. Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avformat.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'libavformat/avformat.h') diff --git a/libavformat/avformat.h b/libavformat/avformat.h index ad186e4432..9a9125a9c5 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define FFMPEG_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 7 +#define LIBAVFORMAT_VERSION_MINOR 8 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -278,6 +278,13 @@ typedef struct AVIndexEntry { int min_distance; /**< min distance between this and the previous keyframe, used to avoid unneeded searching */ } AVIndexEntry; +#define AV_DISPOSITION_DEFAULT 0x0001 +#define AV_DISPOSITION_DUB 0x0002 +#define AV_DISPOSITION_ORIGINAL 0x0004 +#define AV_DISPOSITION_COMMENT 0x0008 +#define AV_DISPOSITION_LYRICS 0x0010 +#define AV_DISPOSITION_KARAOKE 0x0020 + /** * Stream structure. * New fields can be added to the end with minor version bumps. @@ -357,6 +364,8 @@ typedef struct AVStream { int64_t pts_buffer[MAX_REORDER_DELAY+1]; char *filename; /**< source filename of the stream */ + + int disposition; /**< AV_DISPOSITION_* bitfield */ } AVStream; #define AV_PROGRAM_RUNNING 1 -- cgit v1.2.3