Merge remote-tracking branch 'dwbuiten/master'

* dwbuiten/master:
  wav: Add check for 'fmt' tag in SMV code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-22 23:59:57 +02:00
commit d486a6eae9

View File

@ -480,6 +480,10 @@ static int wav_read_header(AVFormatContext *s)
return ret; return ret;
break; break;
case MKTAG('S','M','V','0'): case MKTAG('S','M','V','0'):
if (!got_fmt) {
av_log(s, AV_LOG_ERROR, "found no 'fmt ' tag before the 'SMV0' tag\n");
return AVERROR_INVALIDDATA;
}
// SMV file, a wav file with video appended. // SMV file, a wav file with video appended.
if (size != MKTAG('0','2','0','0')) { if (size != MKTAG('0','2','0','0')) {
av_log(s, AV_LOG_ERROR, "Unknown SMV version found\n"); av_log(s, AV_LOG_ERROR, "Unknown SMV version found\n");