Commit a06d238e authored by Tomas Härdin's avatar Tomas Härdin Committed by Michael Niedermayer

Refactor the tag checking into a switch statement

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 93df511e
...@@ -254,7 +254,8 @@ static int wav_read_header(AVFormatContext *s, ...@@ -254,7 +254,8 @@ static int wav_read_header(AVFormatContext *s,
size = next_tag(pb, &tag); size = next_tag(pb, &tag);
next_tag_ofs = avio_tell(pb) + size; next_tag_ofs = avio_tell(pb) + size;
if (tag == MKTAG('f', 'm', 't', ' ')) { switch (tag) {
case MKTAG('f', 'm', 't', ' '):
/* only parse the first 'fmt ' tag found */ /* only parse the first 'fmt ' tag found */
if (!got_fmt && (ret = wav_parse_fmt_tag(s, size, &st) < 0)) { if (!got_fmt && (ret = wav_parse_fmt_tag(s, size, &st) < 0)) {
return ret; return ret;
...@@ -262,18 +263,22 @@ static int wav_read_header(AVFormatContext *s, ...@@ -262,18 +263,22 @@ static int wav_read_header(AVFormatContext *s,
av_log(s, AV_LOG_WARNING, "found more than one 'fmt ' tag\n"); av_log(s, AV_LOG_WARNING, "found more than one 'fmt ' tag\n");
got_fmt = 1; got_fmt = 1;
} else if (tag == MKTAG('d', 'a', 't', 'a')) { break;
case MKTAG('d', 'a', 't', 'a'):
if (!got_fmt) { if (!got_fmt) {
av_log(s, AV_LOG_ERROR, "found no 'fmt ' tag before the 'data' tag\n"); av_log(s, AV_LOG_ERROR, "found no 'fmt ' tag before the 'data' tag\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
break; goto break_loop;
}else if (tag == MKTAG('f','a','c','t') && !sample_count){ case MKTAG('f','a','c','t'):
if(!sample_count)
sample_count = avio_rl32(pb); sample_count = avio_rl32(pb);
break;
} }
avio_seek(pb, next_tag_ofs, SEEK_SET); avio_seek(pb, next_tag_ofs, SEEK_SET);
} }
break_loop:
if (rf64) if (rf64)
size = data_size; size = data_size;
if (size < 0) if (size < 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment