|
|
@ -1643,7 +1643,6 @@ matroska_read_header (AVFormatContext *s, |
|
|
|
if (ebml_peek_id(matroska, NULL) != MATROSKA_ID_CLUSTER) |
|
|
|
if (ebml_peek_id(matroska, NULL) != MATROSKA_ID_CLUSTER) |
|
|
|
return -1; |
|
|
|
return -1; |
|
|
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
tracks = matroska->tracks.elem; |
|
|
|
tracks = matroska->tracks.elem; |
|
|
|
for (i=0; i < matroska->tracks.nb_elem; i++) { |
|
|
|
for (i=0; i < matroska->tracks.nb_elem; i++) { |
|
|
|
MatroskaTrack *track = &tracks[i]; |
|
|
|
MatroskaTrack *track = &tracks[i]; |
|
|
@ -1693,7 +1692,7 @@ matroska_read_header (AVFormatContext *s, |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!strcmp(track->codec_id, "V_QUICKTIME") && |
|
|
|
else if (!strcmp(track->codec_id, "V_QUICKTIME") && |
|
|
|
(track->codec_priv.size >= 86) && |
|
|
|
(track->codec_priv.size >= 86) && |
|
|
|
(track->codec_priv.data != NULL)) { |
|
|
|
(track->codec_priv.data != NULL)) { |
|
|
|
track->video.fourcc = AV_RL32(track->codec_priv.data); |
|
|
|
track->video.fourcc = AV_RL32(track->codec_priv.data); |
|
|
@ -1825,7 +1824,6 @@ matroska_read_header (AVFormatContext *s, |
|
|
|
/* What do we do with private data? E.g. for Vorbis. */ |
|
|
|
/* What do we do with private data? E.g. for Vorbis. */ |
|
|
|
} |
|
|
|
} |
|
|
|
res = 0; |
|
|
|
res = 0; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
index_list = &matroska->index; |
|
|
|
index_list = &matroska->index; |
|
|
|
index = index_list->elem; |
|
|
|
index = index_list->elem; |
|
|
|