Unified · Split
| @@ -2036,7 +2036,7 @@ static int matroska_parse_content_encodings(MatroskaTrackEncoding *encodings, · 2035 unmodified lines | |||
| 2036 | { | 2036 | { |
| 2037 | if (nb_encodings > 1) { | 2037 | if (nb_encodings > 1) { |
| 2038 | av_log(logctx, AV_LOG_ERROR, | 2038 | av_log(logctx, AV_LOG_ERROR, |
| 2039 | "Multiple combined encodings not supported"); | 2039 | "Multiple combined encodings not supported\n"); |
| 2040 | return 0; | 2040 | return 0; |
| 2041 | } | 2041 | } |
| 2042 | if (!nb_encodings) | 2042 | if (!nb_encodings) |
| @@ -2055,7 +2055,7 @@ static int matroska_parse_content_encodings(MatroskaTrackEncoding *encodings, · 12 unmodified lines | |||
| 2055 | encodings->encryption.key_id.size); | 2055 | encodings->encryption.key_id.size); |
| 2056 | } else { | 2056 | } else { |
| 2057 | encodings->scope = 0; | 2057 | encodings->scope = 0; |
| 2058 | av_log(logctx, AV_LOG_ERROR, "Unsupported encoding type"); | 2058 | av_log(logctx, AV_LOG_ERROR, "Unsupported encoding type\n"); |
| 2059 | } | 2059 | } |
| 2060 | } else if ( | 2060 | } else if ( |
| 2061 | #if CONFIG_ZLIB | 2061 | #if CONFIG_ZLIB |
| @@ -2067,7 +2067,7 @@ static int matroska_parse_content_encodings(MatroskaTrackEncoding *encodings, · 5 unmodified lines | |||
| 2067 | encodings->compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO && | 2067 | encodings->compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO && |
| 2068 | encodings->compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) { | 2068 | encodings->compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) { |
| 2069 | encodings->scope = 0; | 2069 | encodings->scope = 0; |
| 2070 | av_log(logctx, AV_LOG_ERROR, "Unsupported encoding type"); | 2070 | av_log(logctx, AV_LOG_ERROR, "Unsupported encoding type\n"); |
| 2071 | } else if (track->codec_priv.size && encodings[0].scope & 2) { | 2071 | } else if (track->codec_priv.size && encodings[0].scope & 2) { |
| 2072 | uint8_t *codec_priv = track->codec_priv.data; | 2072 | uint8_t *codec_priv = track->codec_priv.data; |
| 2073 | int ret = matroska_decode_buffer(&track->codec_priv.data, | 2073 | int ret = matroska_decode_buffer(&track->codec_priv.data, |