On Fri, Feb 21, 2020 at 12:54 PM Dale Curtis <dalecur...@chromium.org> wrote:
> On Fri, Feb 21, 2020 at 11:26 AM Andreas Rheinhardt < > andreas.rheinha...@gmail.com> wrote: > >> I doubt that this patch still applies as-is because of >> e2307f4ff197646a7feee0edbcdd2d3262932676. >> >> > Ah, good point. Rebased and attached. > Whoops, attached the wrong file. - dale
From f9f2b953a1e71e439a88581894715568987cba5c Mon Sep 17 00:00:00 2001 From: Dale Curtis <dalecur...@chromium.org> Date: Fri, 21 Feb 2020 12:53:30 -0800 Subject: [PATCH] Don't trigger errors for multiple id3 tags. Such errors may make sense for specific formats, but general parsing logic shouldn't be treating these as errors regardless of the error recognition mode. Fixes loading of the following wave when using -err_detect explode: https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webaudio/resources/4ch-440.wav Signed-off-by: Dale Curtis <dalecur...@chromium.org> --- libavformat/utils.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 123d67800b..cb15f6a4b3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -635,15 +635,8 @@ FF_ENABLE_DEPRECATION_WARNINGS s->metadata = s->internal->id3v2_meta; s->internal->id3v2_meta = NULL; } else if (s->internal->id3v2_meta) { - int level = AV_LOG_WARNING; - if (s->error_recognition & AV_EF_COMPLIANT) - level = AV_LOG_ERROR; - av_log(s, level, "Discarding ID3 tags because more suitable tags were found.\n"); + av_log(s, AV_LOG_WARNING, "Discarding ID3 tags because more suitable tags were found.\n"); av_dict_free(&s->internal->id3v2_meta); - if (s->error_recognition & AV_EF_EXPLODE) { - ret = AVERROR_INVALIDDATA; - goto close; - } } if (id3v2_extra_meta) { -- 2.25.0.265.gbab2e86ba0-goog
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
