virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/iff: ignore FVER tag when not processing DSD/DST files

Browse Source 
Fixes ticket #10030.
This commit is contained in:
Peter Ross
2024-12-12 15:44:44 +11:00
parent ba22d6a24f
commit 2202dcfc0f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/iff.c
View File

@ -692,13 +692,15 @@ static int iff_read_header(AVFormatContext *s)
/* DSD tags */ /* DSD tags */
case MKTAG('F','V','E','R'): case MKTAG('F','V','E','R'):
if (data_size < 4) if (iff->form_tag == ID_DSD || iff->form_tag == ID_DST) {
return AVERROR_INVALIDDATA; if (data_size < 4)
version = avio_rb32(pb); return AVERROR_INVALIDDATA;
av_log(s, AV_LOG_DEBUG, "DSIFF v%d.%d.%d.%d\n",version >> 24, (version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF); version = avio_rb32(pb);
if (!new_stream(s, &sta, &iff->audio_stream_index, AVMEDIA_TYPE_AUDIO)) av_log(s, AV_LOG_DEBUG, "DSIFF v%d.%d.%d.%d\n",version >> 24, (version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF);
return AVERROR(ENOMEM); if (!new_stream(s, &sta, &iff->audio_stream_index, AVMEDIA_TYPE_AUDIO))
sta->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; return AVERROR(ENOMEM);
sta->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
}
break; break;
case MKTAG('D','I','I','N'): case MKTAG('D','I','I','N'):