From c837b38dd33a11c3810e988a60193a858eb4f58c Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Sun, 23 Dec 2012 13:33:33 -0500
Subject: [PATCH] au: move skipping of unused data to before parameter
validation
Also do not unnecessarily skip 0 bytes.
---
libavformat/au.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavformat/au.c b/libavformat/au.c
index c429ce100dd..f055a6fdf21 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -81,6 +81,11 @@ static int au_read_header(AVFormatContext *s)
rate = 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);
if (codec == AV_CODEC_ID_NONE) {
@@ -99,11 +104,6 @@ static int au_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA;
}
- if (size >= 24) {
- /* skip unused data */
- avio_skip(pb, size - 24);
- }
-
/* now we are ready: build format streams */
st = avformat_new_stream(s, NULL);
if (!st)
--
GitLab