diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2008-01-27 15:43:17 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-01-27 15:43:17 +0000 |
| commit | f8d7c9d373a8aeede75454a5d51de958b2321478 (patch) | |
| tree | 3417638f4bcfd2656c2bc4dad32b30b77bdd5975 /libavformat/matroska.h | |
| parent | 20963a71565b3d11815d0f9914c16aab873bd58b (diff) | |
| download | ffmpeg-f8d7c9d373a8aeede75454a5d51de958b2321478.tar.gz | |
Add support for Matroska attachments.
patch by eugeni _dot_ stepanov _at_ gmail.com and myself
Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroska.h')
| -rw-r--r-- | libavformat/matroska.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 43fbb9e9c5..370a8bfd89 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -55,6 +55,7 @@ #define MATROSKA_ID_CUES 0x1C53BB6B #define MATROSKA_ID_TAGS 0x1254C367 #define MATROSKA_ID_SEEKHEAD 0x114D9B74 +#define MATROSKA_ID_ATTACHMENTS 0x1941A469 #define MATROSKA_ID_CLUSTER 0x1F43B675 /* IDs in the info master */ @@ -138,6 +139,13 @@ #define MATROSKA_ID_BLOCKDURATION 0x9B #define MATROSKA_ID_BLOCKREFERENCE 0xFB +/* IDs in the attachments master */ +#define MATROSKA_ID_ATTACHEDFILE 0x61A7 +#define MATROSKA_ID_FILENAME 0x466E +#define MATROSKA_ID_FILEMIMETYPE 0x4660 +#define MATROSKA_ID_FILEDATA 0x465C +#define MATROSKA_ID_FILEUID 0x46AE + typedef enum { MATROSKA_TRACK_TYPE_VIDEO = 0x1, MATROSKA_TRACK_TYPE_AUDIO = 0x2, @@ -185,6 +193,11 @@ typedef struct CodecTags{ enum CodecID id; }CodecTags; +typedef struct CodecMime{ + char str[32]; + enum CodecID id; +}CodecMime; + #define MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC "V_MS/VFW/FOURCC" #define MATROSKA_CODEC_ID_AUDIO_ACM "A_MS/ACM" @@ -192,5 +205,6 @@ typedef struct CodecTags{ #define EBML_MAX_DEPTH 16 extern const CodecTags ff_mkv_codec_tags[]; +extern const CodecMime ff_mkv_mime_tags[]; #endif /* FFMPEG_MATROSKA_H */ |