From c959c6ee3dba0bd54bcdb7679cca8b5f3560550d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 2 Aug 2009 17:39:10 +0000 Subject: [PATCH] vfwcap: Move vfw_read_close to avoid forward declaration. Patch by Diego. Originally committed as revision 19567 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavdevice/vfwcap.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 4a027225bd..5dee0e0140 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -201,7 +201,22 @@ fail: return FALSE; } -static int vfw_read_close(AVFormatContext *s); +static int vfw_read_close(AVFormatContext *s) +{ + struct vfw_ctx *ctx = s->priv_data; + + if(ctx->hwnd) { + SendMessage(ctx->hwnd, WM_CAP_SET_CALLBACK_VIDEOSTREAM, 0, 0); + SendMessage(ctx->hwnd, WM_CAP_DRIVER_DISCONNECT, 0, 0); + DestroyWindow(ctx->hwnd); + } + if(ctx->mutex) + CloseHandle(ctx->mutex); + if(ctx->event) + CloseHandle(ctx->event); + + return 0; +} static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap) { @@ -402,23 +417,6 @@ static int vfw_read_packet(AVFormatContext *s, AVPacket *pkt) return pkt->size; } -static int vfw_read_close(AVFormatContext *s) -{ - struct vfw_ctx *ctx = s->priv_data; - - if(ctx->hwnd) { - SendMessage(ctx->hwnd, WM_CAP_SET_CALLBACK_VIDEOSTREAM, 0, 0); - SendMessage(ctx->hwnd, WM_CAP_DRIVER_DISCONNECT, 0, 0); - DestroyWindow(ctx->hwnd); - } - if(ctx->mutex) - CloseHandle(ctx->mutex); - if(ctx->event) - CloseHandle(ctx->event); - - return 0; -} - AVInputFormat vfwcap_demuxer = { "vfwcap", NULL_IF_CONFIG_SMALL("VFW video capture"),