Browse Source

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>
tags/n3.0
Paul B Mahol 10 years ago
parent
commit
4e583eda5f
1 changed files with 6 additions and 1 deletions
  1. +6
    -1
      libavformat/wavdec.c

+ 6
- 1
libavformat/wavdec.c View File

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

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) {
av_log(s, AV_LOG_ERROR, "no 'data' tag found\n");
return AVERROR_INVALIDDATA;


Loading…
Cancel
Save