Browse Source

Simplify more errors by using goto

Originally committed as revision 12819 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Ramiro Polla 18 years ago
parent
commit
e110f48608
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      libavdevice/vfwcap.c

+ 5
- 4
libavdevice/vfwcap.c View File

@@ -308,8 +308,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
} }
ret = SendMessage(ctx->hwnd, WM_CAP_GET_VIDEOFORMAT, bisize, (LPARAM) bi); ret = SendMessage(ctx->hwnd, WM_CAP_GET_VIDEOFORMAT, bisize, (LPARAM) bi);
if(!ret) { if(!ret) {
av_free(bi);
goto fail_io;
goto fail_bi;
} }


dump_bih(s, &bi->bmiHeader); 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); ret = SendMessage(ctx->hwnd, WM_CAP_SET_VIDEOFORMAT, bisize, (LPARAM) bi);
if(!ret) { if(!ret) {
av_log(s, AV_LOG_ERROR, "Could not set Video Format.\n"); 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; biCompression = bi->bmiHeader.biCompression;
@@ -392,6 +390,9 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)


return 0; return 0;


fail_bi:
av_free(bi);

fail_io: fail_io:
vfw_read_close(s); vfw_read_close(s);
return AVERROR_IO; return AVERROR_IO;


Loading…
Cancel
Save