diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-02-15 15:34:22 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-02-15 15:34:22 +0000 |
| commit | 325ace3efcbfe57ce271ec420804d8ec5a1c2e00 (patch) | |
| tree | 533d06cc9ca0008524d8619da92420153d071327 /libavformat/matroskadec.c | |
| parent | 38766e084f28f3515598720665507ca54eccddae (diff) | |
matroskadec: read track and attachment uid
will be useful for generic metadata support
Originally committed as revision 17330 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 493a30070e..916771dc71 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -128,6 +128,7 @@ typedef struct { typedef struct { uint64_t num; + uint64_t uid; uint64_t type; char *name; char *codec_id; @@ -145,6 +146,7 @@ typedef struct { } MatroskaTrack; typedef struct { + uint64_t uid; char *filename; char *mime; EbmlBin bin; @@ -305,6 +307,7 @@ static EbmlSyntax matroska_track_encodings[] = { static EbmlSyntax matroska_track[] = { { MATROSKA_ID_TRACKNUMBER, EBML_UINT, 0, offsetof(MatroskaTrack,num) }, { MATROSKA_ID_TRACKNAME, EBML_UTF8, 0, offsetof(MatroskaTrack,name) }, + { MATROSKA_ID_TRACKUID, EBML_UINT, 0, offsetof(MatroskaTrack,uid) }, { MATROSKA_ID_TRACKTYPE, EBML_UINT, 0, offsetof(MatroskaTrack,type) }, { MATROSKA_ID_CODECID, EBML_STR, 0, offsetof(MatroskaTrack,codec_id) }, { MATROSKA_ID_CODECPRIVATE, EBML_BIN, 0, offsetof(MatroskaTrack,codec_priv) }, @@ -315,7 +318,6 @@ static EbmlSyntax matroska_track[] = { { MATROSKA_ID_TRACKVIDEO, EBML_NEST, 0, offsetof(MatroskaTrack,video), {.n=matroska_track_video} }, { MATROSKA_ID_TRACKAUDIO, EBML_NEST, 0, offsetof(MatroskaTrack,audio), {.n=matroska_track_audio} }, { MATROSKA_ID_TRACKCONTENTENCODINGS,EBML_NEST, 0, 0, {.n=matroska_track_encodings} }, - { MATROSKA_ID_TRACKUID, EBML_NONE }, { MATROSKA_ID_TRACKFLAGENABLED, EBML_NONE }, { MATROSKA_ID_TRACKFLAGFORCED, EBML_NONE }, { MATROSKA_ID_TRACKFLAGLACING, EBML_NONE }, @@ -335,11 +337,11 @@ static EbmlSyntax matroska_tracks[] = { }; static EbmlSyntax matroska_attachment[] = { + { MATROSKA_ID_FILEUID, EBML_UINT, 0, offsetof(MatroskaAttachement,uid) }, { MATROSKA_ID_FILENAME, EBML_UTF8, 0, offsetof(MatroskaAttachement,filename) }, { MATROSKA_ID_FILEMIMETYPE, EBML_STR, 0, offsetof(MatroskaAttachement,mime) }, { MATROSKA_ID_FILEDATA, EBML_BIN, 0, offsetof(MatroskaAttachement,bin) }, { MATROSKA_ID_FILEDESC, EBML_NONE }, - { MATROSKA_ID_FILEUID, EBML_NONE }, { 0 } }; |