virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avformat/wavdec: allow data chunk to be before fmt/xma2 chunk

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-11-08 12:27:42 +01:00
parent a0f75c46d3
commit 4e583eda5f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/wavdec.c
View File

@ -379,7 +379,7 @@ static int wav_read_header(AVFormatContext *s)
got_xma2 = 1; got_xma2 = 1;
break; break;
case MKTAG('d', 'a', 't', 'a'): case MKTAG('d', 'a', 't', 'a'):
if (!got_fmt && !got_xma2) { if (!pb->seekable && !got_fmt && !got_xma2) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"found no 'fmt ' tag before the 'data' tag\n"); "found no 'fmt ' tag before the 'data' tag\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -474,6 +474,11 @@ static int wav_read_header(AVFormatContext *s)
} }
break_loop: break_loop:
if (!got_fmt && !got_xma2) {
av_log(s, AV_LOG_ERROR, "no 'fmt ' or 'XMA2' tag found\n");
return AVERROR_INVALIDDATA;
}
if (data_ofs < 0) { if (data_ofs < 0) {
av_log(s, AV_LOG_ERROR, "no 'data' tag found\n"); av_log(s, AV_LOG_ERROR, "no 'data' tag found\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;