From c6919694d0bdc28a82a20ab21d59c7dfb9c38b4d Mon Sep 17 00:00:00 2001 From: Sébastien Moutte Date: Tue, 30 May 2006 21:07:38 +0000 Subject: gst/avi/gstavidemux.c: add an explicit dll imported declaration for GST_CAT_EVENT+WIN32 Original commit message from CVS: * gst/avi/gstavidemux.c: add an explicit dll imported declaration for GST_CAT_EVENT+WIN32 * win32/MANIFEST: sort file listing * win32/vs6/libgstavi.dsp: add gstavimux.c to the project * win32/vs6/libgstid3demux.dsp: add link to zlib library * win32/vs6/libgstmatroska.dsp: add matroska-ids.c to the project --- gst/avi/gstavidemux.c | 52 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) (limited to 'gst') diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 8136cd93..5d26eac9 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -56,43 +56,53 @@ GST_DEBUG_CATEGORY_STATIC (avidemux_debug); #define GST_CAT_DEFAULT avidemux_debug +#ifndef WIN32 GST_DEBUG_CATEGORY_EXTERN (GST_CAT_EVENT); +#else +extern +_declspec (dllimport) + GstDebugCategory *GST_CAT_EVENT; +#endif -static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink", + static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-msvideo") ); -static void gst_avi_demux_base_init (GstAviDemuxClass * klass); -static void gst_avi_demux_class_init (GstAviDemuxClass * klass); -static void gst_avi_demux_init (GstAviDemux * avi); + static void gst_avi_demux_base_init (GstAviDemuxClass * klass); + static void gst_avi_demux_class_init (GstAviDemuxClass * klass); + static void gst_avi_demux_init (GstAviDemux * avi); -static void gst_avi_demux_reset (GstAviDemux * avi); + static void gst_avi_demux_reset (GstAviDemux * avi); #if 0 -static const GstEventMask *gst_avi_demux_get_event_mask (GstPad * pad); + static const GstEventMask *gst_avi_demux_get_event_mask (GstPad * pad); #endif -static gboolean gst_avi_demux_handle_src_event (GstPad * pad, GstEvent * event); + static gboolean gst_avi_demux_handle_src_event (GstPad * pad, + GstEvent * event); #if 0 -static const GstFormat *gst_avi_demux_get_src_formats (GstPad * pad); + static const GstFormat *gst_avi_demux_get_src_formats (GstPad * pad); #endif -static const GstQueryType *gst_avi_demux_get_src_query_types (GstPad * pad); -static gboolean gst_avi_demux_handle_src_query (GstPad * pad, GstQuery * query); -static gboolean gst_avi_demux_src_convert (GstPad * pad, - GstFormat src_format, - gint64 src_value, GstFormat * dest_format, gint64 * dest_value); - -static gboolean gst_avi_demux_handle_seek (GstAviDemux * avi, gboolean update); -static void gst_avi_demux_loop (GstPad * pad); -static gboolean gst_avi_demux_sink_activate (GstPad * sinkpad); -static gboolean gst_avi_demux_sink_activate_pull (GstPad * sinkpad, + static const GstQueryType *gst_avi_demux_get_src_query_types (GstPad * + pad); + static gboolean gst_avi_demux_handle_src_query (GstPad * pad, + GstQuery * query); + static gboolean gst_avi_demux_src_convert (GstPad * pad, + GstFormat src_format, gint64 src_value, GstFormat * dest_format, + gint64 * dest_value); + + static gboolean gst_avi_demux_handle_seek (GstAviDemux * avi, + gboolean update); + static void gst_avi_demux_loop (GstPad * pad); + static gboolean gst_avi_demux_sink_activate (GstPad * sinkpad); + static gboolean gst_avi_demux_sink_activate_pull (GstPad * sinkpad, gboolean active); -static GstStateChangeReturn gst_avi_demux_change_state (GstElement * element, - GstStateChange transition); + static GstStateChangeReturn gst_avi_demux_change_state (GstElement * + element, GstStateChange transition); -static GstElementClass *parent_class = NULL; + static GstElementClass *parent_class = NULL; GType gst_avi_demux_get_type (void) -- cgit