This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 6bae3bd385 avformat/wavdec: move ID3v2 auto-parsing flag from w64 to
wav
6bae3bd385 is described below
commit 6bae3bd38558363542fca509cb7677d727f2beb9
Author: Nil Fons Miret <[email protected]>
AuthorDate: Fri Jul 10 15:04:16 2026 +0000
Commit: Daniel Verkamp <[email protected]>
CommitDate: Sat Jul 11 02:46:34 2026 +0000
avformat/wavdec: move ID3v2 auto-parsing flag from w64 to wav
9d037c54f2 (avformat/demux: avoid unconditional ID3v2 tag consumption)
introduced FF_INFMT_FLAG_ID3V2_AUTO to opt formats into generic ID3v2
parsing, but mistakenly set it on ff_w64_demuxer instead of
ff_wav_demuxer (both live in wavdec.c, with w64 at the end of the file).
As a result, WAV files carrying a prepended ID3v2 tag were no longer
parsed generically, while w64 attempted to parse an ID3v2 tag it didn't
need. Move the flag to the wav demuxer, restoring the originally
intended behavior.
Reported-by: Daniel Verkamp <[email protected]>
Signed-off-by: Nil Fons Miret <[email protected]>
---
libavformat/wavdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 8e09e1ac5a..8501d94deb 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -860,6 +860,7 @@ const FFInputFormat ff_wav_demuxer = {
.p.codec_tag = ff_wav_codec_tags_list,
.p.priv_class = &wav_demuxer_class,
.priv_data_size = sizeof(WAVDemuxContext),
+ .flags_internal = FF_INFMT_FLAG_ID3V2_AUTO,
.read_probe = wav_probe,
.read_header = wav_read_header,
.read_packet = wav_read_packet,
@@ -1031,7 +1032,6 @@ const FFInputFormat ff_w64_demuxer = {
.p.codec_tag = ff_wav_codec_tags_list,
.p.priv_class = &w64_demuxer_class,
.priv_data_size = sizeof(WAVDemuxContext),
- .flags_internal = FF_INFMT_FLAG_ID3V2_AUTO,
.read_probe = w64_probe,
.read_header = w64_read_header,
.read_packet = wav_read_packet,
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
