Message ID | 20240306080250.5120-1-anton@khirnov.net |
---|---|
State | Accepted |
Commit | 384a207ea90b88af2e2126fbc22e683c2b5c0e08 |
Headers | show |
Series | [FFmpeg-devel] lavf/matroskadec: add missing linebreaks in error messages | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
On date Wednesday 2024-03-06 09:02:50 +0100, Anton Khirnov wrote: > --- > libavformat/matroskadec.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > index 5d3d18a146..6d6a60c552 100644 > --- a/libavformat/matroskadec.c > +++ b/libavformat/matroskadec.c > @@ -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"); Seems obviously fine, thanks.
Anton Khirnov: > --- > libavformat/matroskadec.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > index 5d3d18a146..6d6a60c552 100644 > --- a/libavformat/matroskadec.c > +++ b/libavformat/matroskadec.c > @@ -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, LGTM. - Andreas
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 5d3d18a146..6d6a60c552 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -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,