From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Mon, 14 Apr 2008 15:07:12 +0000 (+0000)
Subject: Simplify more errors by using goto
X-Git-Tag: v0.5~5116
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e110f48608f2ce3d9dca05e7bfc414bd8da02043;p=coroid%2Flibav_saccubus.git

Simplify more errors by using goto

Originally committed as revision 12819 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index ababab9c8..1ab5548ce 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -308,8 +308,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
     }
     ret = SendMessage(ctx->hwnd, WM_CAP_GET_VIDEOFORMAT, bisize, (LPARAM) bi);
     if(!ret) {
-        av_free(bi);
-        goto fail_io;
+        goto fail_bi;
     }
 
     dump_bih(s, &bi->bmiHeader);
@@ -322,8 +321,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
     ret = SendMessage(ctx->hwnd, WM_CAP_SET_VIDEOFORMAT, bisize, (LPARAM) bi);
     if(!ret) {
         av_log(s, AV_LOG_ERROR, "Could not set Video Format.\n");
-        av_free(bi);
-        goto fail_io;
+        goto fail_bi;
     }
 
     biCompression = bi->bmiHeader.biCompression;
@@ -392,6 +390,9 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     return 0;
 
+fail_bi:
+    av_free(bi);
+
 fail_io:
     vfw_read_close(s);
     return AVERROR_IO;