generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

au: move skipping of unused data to before parameter validation

Browse Source 
Also do not unnecessarily skip 0 bytes.
This commit is contained in:
Justin Ruggles 2012-12-23 13:33:33 -05:00
parent fb48f825e3
commit c837b38dd3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/au.c
View File

@ -81,6 +81,11 @@ static int au_read_header(AVFormatContext *s)
rate = avio_rb32(pb); rate = avio_rb32(pb);
channels = avio_rb32(pb); channels = avio_rb32(pb);
if (size > 24) {
/* skip unused data */
avio_skip(pb, size - 24);
}
codec = ff_codec_get_id(codec_au_tags, id); codec = ff_codec_get_id(codec_au_tags, id);
if (codec == AV_CODEC_ID_NONE) { if (codec == AV_CODEC_ID_NONE) {
@ -99,11 +104,6 @@ static int au_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (size >= 24) {
/* skip unused data */
avio_skip(pb, size - 24);
}
/* now we are ready: build format streams */ /* now we are ready: build format streams */
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
if (!st) if (!st)