diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/avi/gstavidemux.c | 55 |
2 files changed, 29 insertions, 33 deletions
@@ -1,3 +1,10 @@ +2006-07-25 Stefan Kost <ensonic@users.sf.net> + + * gst/avi/gstavidemux.c: (gst_avi_demux_read_subindexes), + (gst_avi_demux_parse_stream): + Moved win32 variant of GST_DEBUG_CATEGORY_EXTERN to gstinfo.h. Fixed + indentation and spacing. + 2006-07-24 Tim-Philipp Müller <tim at centricular dot net> * docs/plugins/Makefile.am: diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index e790d675..4f758fb2 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -56,53 +56,42 @@ 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) @@ -287,7 +276,6 @@ gst_avi_demux_index_entry_for_time (GstAviDemux * avi, return last_entry; } - #if 0 static const GstFormat * gst_avi_demux_get_src_formats (GstPad * pad) @@ -969,6 +957,8 @@ gst_avi_demux_read_subindexes (GstAviDemux * avi, GstBuffer *buf; gint i, n; + GST_DEBUG_OBJECT (avi, "gst_avi_demux_read_subindexes"); + for (n = 0; n < avi->num_streams; n++) { avi_stream_context *stream = &avi->stream[n]; @@ -1039,7 +1029,6 @@ gst_avi_demux_parse_stream (GstElement * element, GstBuffer * buf) } else if (!gst_riff_parse_strh (element, sub, &stream->strh)) goto fail; - /* read strf */ if (!gst_riff_parse_chunk (element, buf, &offset, &tag, &sub) || tag != GST_RIFF_TAG_strf) { |