From eb1e7f78ea9f8db391961d8fe30b3fae3ea20d5c Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 15 Mar 2011 07:54:22 +0100
Subject: id3v2: simplify error handling.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
---
 libavformat/id3v2.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'libavformat/id3v2.c')

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index fb4c761a27..13272a493f 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -188,7 +188,7 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
     char tag[5];
     int64_t next, end = avio_tell(s->pb) + len;
     int taghdrlen;
-    const char *reason;
+    const char *reason = NULL;
     AVIOContext pb;
     unsigned char *buffer = NULL;
     int buffer_size = 0;
@@ -286,14 +286,12 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
     if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */
         end += 10;
 
+  error:
+    if (reason)
+        av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
     avio_seek(s->pb, end, SEEK_SET);
     av_free(buffer);
     return;
-
-  error:
-    av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
-    avio_seek(s->pb, len, SEEK_CUR);
-    av_free(buffer);
 }
 
 void ff_id3v2_read(AVFormatContext *s, const char *magic)
-- 
cgit v1.2.3