|
|
|
@ -2036,7 +2036,7 @@ static int matroska_parse_content_encodings(MatroskaTrackEncoding *encodings, |
|
|
|
|
{ |
|
|
|
|
if (nb_encodings > 1) { |
|
|
|
|
av_log(logctx, AV_LOG_ERROR, |
|
|
|
|
"Multiple combined encodings not supported"); |
|
|
|
|
"Multiple combined encodings not supported\n"); |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
if (!nb_encodings) |
|
|
|
@ -2055,7 +2055,7 @@ static int matroska_parse_content_encodings(MatroskaTrackEncoding *encodings, |
|
|
|
|
encodings->encryption.key_id.size); |
|
|
|
|
} else { |
|
|
|
|
encodings->scope = 0; |
|
|
|
|
av_log(logctx, AV_LOG_ERROR, "Unsupported encoding type"); |
|
|
|
|
av_log(logctx, AV_LOG_ERROR, "Unsupported encoding type\n"); |
|
|
|
|
} |
|
|
|
|
} else if ( |
|
|
|
|
#if CONFIG_ZLIB |
|
|
|
@ -2067,7 +2067,7 @@ static int matroska_parse_content_encodings(MatroskaTrackEncoding *encodings, |
|
|
|
|
encodings->compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO && |
|
|
|
|
encodings->compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) { |
|
|
|
|
encodings->scope = 0; |
|
|
|
|
av_log(logctx, AV_LOG_ERROR, "Unsupported encoding type"); |
|
|
|
|
av_log(logctx, AV_LOG_ERROR, "Unsupported encoding type\n"); |
|
|
|
|
} else if (track->codec_priv.size && encodings[0].scope & 2) { |
|
|
|
|
uint8_t *codec_priv = track->codec_priv.data; |
|
|
|
|
int ret = matroska_decode_buffer(&track->codec_priv.data, |
|
|
|
|