|
|
|
@ -1280,9 +1280,7 @@ matroska_execute_seekhead(MatroskaDemuxContext *matroska) |
|
|
|
|
static int |
|
|
|
|
matroska_aac_profile (char *codec_id) |
|
|
|
|
{ |
|
|
|
|
static const char *aac_profiles[] = { |
|
|
|
|
"MAIN", "LC", "SSR" |
|
|
|
|
}; |
|
|
|
|
static const char *aac_profiles[] = { "MAIN", "LC", "SSR" }; |
|
|
|
|
int profile; |
|
|
|
|
|
|
|
|
|
for (profile=0; profile<ARRAY_SIZE(aac_profiles); profile++) |
|
|
|
@ -1536,8 +1534,7 @@ matroska_read_header (AVFormatContext *s, |
|
|
|
|
|
|
|
|
|
if (codec_id == CODEC_ID_NONE) |
|
|
|
|
av_log(matroska->ctx, AV_LOG_INFO, |
|
|
|
|
"Unknown/unsupported CodecID %s.\n", |
|
|
|
|
track->codec_id); |
|
|
|
|
"Unknown/unsupported CodecID %s.\n", track->codec_id); |
|
|
|
|
|
|
|
|
|
av_set_pts_info(st, 64, matroska->time_scale*track->time_scale, 1000*1000*1000); /* 64 bit pts in ns */ |
|
|
|
|
|
|
|
|
@ -1815,8 +1812,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size, |
|
|
|
|
uint8_t *pkt_data = data; |
|
|
|
|
|
|
|
|
|
if (encodings && encodings->scope & 1) { |
|
|
|
|
offset = matroska_decode_buffer(&pkt_data, &pkt_size, |
|
|
|
|
track); |
|
|
|
|
offset = matroska_decode_buffer(&pkt_data,&pkt_size, track); |
|
|
|
|
if (offset < 0) |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|