Skip to content

F
ffmpeg.wasm-core
Commit e110f486 authored by Ramiro Polla's avatar Ramiro Polla
Browse files
Options

Simplify more errors by using goto 

Originally committed as revision 12819 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 76c2662b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
libavdevice/vfwcap.c
View file @ e110f486
...@@ -308,8 +308,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -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_bi;
goto fail_io;
} }
dump_bih(s, &bi->bmiHeader); dump_bih(s, &bi->bmiHeader);
...@@ -322,8 +321,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -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_bi;
goto fail_io;
} }
biCompression = bi->bmiHeader.biCompression; biCompression = bi->bmiHeader.biCompression;
...@@ -392,6 +390,9 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment