Revision 325ace3e libavformat/matroskadec.c

View differences:

libavformat/matroskadec.c
128 128

  
129 129
typedef struct {
130 130
    uint64_t num;
131
    uint64_t uid;
131 132
    uint64_t type;
132 133
    char    *name;
133 134
    char    *codec_id;
......
145 146
} MatroskaTrack;
146 147

  
147 148
typedef struct {
149
    uint64_t uid;
148 150
    char *filename;
149 151
    char *mime;
150 152
    EbmlBin bin;
......
305 307
static EbmlSyntax matroska_track[] = {
306 308
    { MATROSKA_ID_TRACKNUMBER,          EBML_UINT, 0, offsetof(MatroskaTrack,num) },
307 309
    { MATROSKA_ID_TRACKNAME,            EBML_UTF8, 0, offsetof(MatroskaTrack,name) },
310
    { MATROSKA_ID_TRACKUID,             EBML_UINT, 0, offsetof(MatroskaTrack,uid) },
308 311
    { MATROSKA_ID_TRACKTYPE,            EBML_UINT, 0, offsetof(MatroskaTrack,type) },
309 312
    { MATROSKA_ID_CODECID,              EBML_STR,  0, offsetof(MatroskaTrack,codec_id) },
310 313
    { MATROSKA_ID_CODECPRIVATE,         EBML_BIN,  0, offsetof(MatroskaTrack,codec_priv) },
......
315 318
    { MATROSKA_ID_TRACKVIDEO,           EBML_NEST, 0, offsetof(MatroskaTrack,video), {.n=matroska_track_video} },
316 319
    { MATROSKA_ID_TRACKAUDIO,           EBML_NEST, 0, offsetof(MatroskaTrack,audio), {.n=matroska_track_audio} },
317 320
    { MATROSKA_ID_TRACKCONTENTENCODINGS,EBML_NEST, 0, 0, {.n=matroska_track_encodings} },
318
    { MATROSKA_ID_TRACKUID,             EBML_NONE },
319 321
    { MATROSKA_ID_TRACKFLAGENABLED,     EBML_NONE },
320 322
    { MATROSKA_ID_TRACKFLAGFORCED,      EBML_NONE },
321 323
    { MATROSKA_ID_TRACKFLAGLACING,      EBML_NONE },
......
335 337
};
336 338

  
337 339
static EbmlSyntax matroska_attachment[] = {
340
    { MATROSKA_ID_FILEUID,            EBML_UINT, 0, offsetof(MatroskaAttachement,uid) },
338 341
    { MATROSKA_ID_FILENAME,           EBML_UTF8, 0, offsetof(MatroskaAttachement,filename) },
339 342
    { MATROSKA_ID_FILEMIMETYPE,       EBML_STR,  0, offsetof(MatroskaAttachement,mime) },
340 343
    { MATROSKA_ID_FILEDATA,           EBML_BIN,  0, offsetof(MatroskaAttachement,bin) },
341 344
    { MATROSKA_ID_FILEDESC,           EBML_NONE },
342
    { MATROSKA_ID_FILEUID,            EBML_NONE },
343 345
    { 0 }
344 346
};
345 347

  

Also available in: Unified diff