From 1fe4050c0a299016b82bfdb70dd46d414a53a082 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 8 Oct 2007 17:46:45 +0000 Subject: gst/: Fix compiler warnings shown by Forte. Original commit message from CVS: * gst/librfb/rfbbuffer.c: (rfb_buffer_new_and_alloc): * gst/librfb/rfbbuffer.h: * gst/librfb/rfbdecoder.c: (rfb_socket_get_buffer): * gst/mpegvideoparse/mpegvideoparse.c: (gst_mpegvideoparse_chain): * gst/nsf/nes6502.c: (nes6502_execute): * gst/real/gstrealaudiodec.c: (gst_real_audio_dec_setcaps): * gst/real/gstrealvideodec.c: (open_library): * gst/real/gstrealvideodec.h: * gst/rtpmanager/gstrtpsession.c: (create_recv_rtp_sink), (create_recv_rtcp_sink), (create_send_rtp_sink): Fix compiler warnings shown by Forte. --- gst/real/gstrealaudiodec.c | 18 ++++++++++-------- gst/real/gstrealvideodec.c | 8 ++++---- gst/real/gstrealvideodec.h | 13 +++++++++---- 3 files changed, 23 insertions(+), 16 deletions(-) (limited to 'gst/real') diff --git a/gst/real/gstrealaudiodec.c b/gst/real/gstrealaudiodec.c index 1045e11f..9cb1f5df 100644 --- a/gst/real/gstrealaudiodec.c +++ b/gst/real/gstrealaudiodec.c @@ -282,14 +282,16 @@ codec_search_done: g_module_symbol (module, "RASetPwd", &ra_set_pwd); g_module_symbol (module, "SetDLLAccessPath", &set_dll_access_path); - funcs.RACloseCodec = ra_close_codec; - funcs.RADecode = ra_decode; - funcs.RAFreeDecoder = ra_free_decoder; - funcs.RAOpenCodec2 = ra_open_codec2; - funcs.RAInitDecoder = ra_init_decoder; - funcs.RASetFlavor = ra_set_flavor; - funcs.RASetPwd = ra_set_pwd; - funcs.SetDLLAccessPath = set_dll_access_path; + funcs.RACloseCodec = (guint16 (*)(gpointer)) ra_close_codec; + funcs.RADecode = + (guint16 (*)(gpointer, guint8 *, guint32, guint8 *, guint32 *, guint32)) + ra_decode; + funcs.RAFreeDecoder = (guint16 (*)(gpointer)) ra_free_decoder; + funcs.RAOpenCodec2 = (guint16 (*)(gpointer, const gchar *)) ra_open_codec2; + funcs.RAInitDecoder = (guint16 (*)(gpointer, gpointer)) ra_init_decoder; + funcs.RASetFlavor = (guint16 (*)(gpointer, guint16)) ra_set_flavor; + funcs.RASetPwd = (void (*)(gpointer, gchar *)) ra_set_pwd; + funcs.SetDLLAccessPath = (void (*)(gchar *)) set_dll_access_path; if (funcs.SetDLLAccessPath) funcs.SetDLLAccessPath (split_path[i]); diff --git a/gst/real/gstrealvideodec.c b/gst/real/gstrealvideodec.c index 75bc6bc1..be6292f1 100644 --- a/gst/real/gstrealvideodec.c +++ b/gst/real/gstrealvideodec.c @@ -461,10 +461,10 @@ codec_search_done: goto could_not_load; } - hooks->init = rv_init; - hooks->free = rv_free; - hooks->transform = rv_transform; - hooks->custom_message = rv_custom_msg; + hooks->init = (GstRealVideoDecInitFunc) rv_init; + hooks->free = (GstRealVideoDecFreeFunc) rv_free; + hooks->transform = (GstRealVideoDecTransformFunc) rv_transform; + hooks->custom_message = (GstRealVideoDecMessageFunc) rv_custom_msg; hooks->module = module; dec->error_count = 0; diff --git a/gst/real/gstrealvideodec.h b/gst/real/gstrealvideodec.h index 148bd8ae..d3ac5391 100644 --- a/gst/real/gstrealvideodec.h +++ b/gst/real/gstrealvideodec.h @@ -35,6 +35,11 @@ typedef struct _GstRealVideoDec GstRealVideoDec; typedef struct _GstRealVideoDecClass GstRealVideoDecClass; typedef enum _GstRealVideoDecVersion GstRealVideoDecVersion; +typedef guint32 (*GstRealVideoDecMessageFunc) (gpointer, gpointer); +typedef guint32 (*GstRealVideoDecFreeFunc) (gpointer); +typedef guint32 (*GstRealVideoDecInitFunc) (gpointer, gpointer); +typedef guint32 (*GstRealVideoDecTransformFunc) (gchar *, gchar *, gpointer, gpointer, gpointer); + enum _GstRealVideoDecVersion { GST_REAL_VIDEO_DEC_VERSION_2 = 2, @@ -45,10 +50,10 @@ enum _GstRealVideoDecVersion typedef struct { GModule *module; - guint32 (*custom_message) (gpointer, gpointer); - guint32 (*free) (gpointer); - guint32 (*init) (gpointer, gpointer); - guint32 (*transform) (gchar *, gchar *, gpointer, gpointer, gpointer); + GstRealVideoDecMessageFunc custom_message; + GstRealVideoDecFreeFunc free; + GstRealVideoDecInitFunc init; + GstRealVideoDecTransformFunc transform; gpointer context; } GstRealVideoDecHooks; -- cgit v1.2.1