* [FFmpeg-devel] [PATCH] lavf/matroskadec: add missing linebreaks in error messages
@ 2024-03-06 8:02 Anton Khirnov
2024-03-06 15:48 ` Stefano Sabatini
2024-03-07 0:39 ` Andreas Rheinhardt
0 siblings, 2 replies; 3+ messages in thread
From: Anton Khirnov @ 2024-03-06 8:02 UTC (permalink / raw)
To: ffmpeg-devel
---
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,
--
2.43.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavf/matroskadec: add missing linebreaks in error messages
2024-03-06 8:02 [FFmpeg-devel] [PATCH] lavf/matroskadec: add missing linebreaks in error messages Anton Khirnov
@ 2024-03-06 15:48 ` Stefano Sabatini
2024-03-07 0:39 ` Andreas Rheinhardt
1 sibling, 0 replies; 3+ messages in thread
From: Stefano Sabatini @ 2024-03-06 15:48 UTC (permalink / raw)
To: FFmpeg development discussions and patches
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.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavf/matroskadec: add missing linebreaks in error messages
2024-03-06 8:02 [FFmpeg-devel] [PATCH] lavf/matroskadec: add missing linebreaks in error messages Anton Khirnov
2024-03-06 15:48 ` Stefano Sabatini
@ 2024-03-07 0:39 ` Andreas Rheinhardt
1 sibling, 0 replies; 3+ messages in thread
From: Andreas Rheinhardt @ 2024-03-07 0:39 UTC (permalink / raw)
To: ffmpeg-devel
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
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-07 0:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-06 8:02 [FFmpeg-devel] [PATCH] lavf/matroskadec: add missing linebreaks in error messages Anton Khirnov
2024-03-06 15:48 ` Stefano Sabatini
2024-03-07 0:39 ` Andreas Rheinhardt
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git