ext/mad/gstid3tag.c (gst_id3_tag_get_event_masks): Reschmoove.

Original commit message from CVS:
2005-06-29  Andy Wingo  <wingo@pobox.com>

* ext/mad/gstid3tag.c (gst_id3_tag_get_event_masks): Reschmoove.

* ext/mad/gstmad.c (gst_mad_get_event_masks): Remove.
(gst_mad_chain): Appease GCC.

* ext/libcaca/gstcacasink.c (gst_cacasink_setcaps): Signedness.

* ext/aalib/gstaasink.c (gst_aasink_fixate): Unref caps, not free.
(gst_aasink_scale): Signedness.

diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c
index c8e76e86437ffaf42ce91970eb0c7c7435bbe7be..dd69ac115b17af7de4267190dd6734691d9555d6 100644 (file)
--- a/ext/mad/gstid3tag.c
+++ b/ext/mad/gstid3tag.c
@@ -160,7 +160,6 @@ static void gst_id3_tag_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
 static gboolean gst_id3_tag_src_event (GstPad * pad, GstEvent * event);
-static const GstEventMask *gst_id3_tag_get_event_masks (GstPad * pad);
 static const GstQueryType *gst_id3_tag_get_query_types (GstPad * pad);
 
 static gboolean gst_id3_tag_src_query (GstPad * pad, GstQuery * query);
@@ -403,16 +402,7 @@ gst_id3_tag_get_property (GObject * object, guint prop_id, GValue * value,
   GST_LOG_OBJECT (tag, "setting state to %s", #new_state );                            \
   tag->state = new_state;                                                              \
 }G_STMT_END
-static const GstEventMask *
-gst_id3_tag_get_event_masks (GstPad * pad)
-{
-  static const GstEventMask gst_id3_tag_src_event_masks[] = {
-    {GST_EVENT_SEEK, GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH},
-    {0,}
-  };
 
-  return gst_id3_tag_src_event_masks;
-}
 static const GstQueryType *
 gst_id3_tag_get_query_types (GstPad * pad)
 {

diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 3dc345cbf10ed916934ea0ffb8073d6c6ce7e0a7..b385e8973a34c1ee710009b1921f2f732ec91bf2 100644 (file)
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -159,7 +159,6 @@ static gboolean gst_mad_src_event (GstPad * pad, GstEvent * event);
 static const GstFormat *gst_mad_get_formats (GstPad * pad);
 #endif
 
-static const GstEventMask *gst_mad_get_event_masks (GstPad * pad);
 static const GstQueryType *gst_mad_get_query_types (GstPad * pad);
 
 static gboolean gst_mad_src_query (GstPad * pad, GstQuery * query);
@@ -342,10 +341,6 @@ gst_mad_init (GstMad * mad)
   gst_element_add_pad (GST_ELEMENT (mad), mad->srcpad);
   gst_pad_set_event_function (mad->srcpad,
       GST_DEBUG_FUNCPTR (gst_mad_src_event));
-#if 0
-  gst_pad_set_event_mask_function (mad->srcpad,
-      GST_DEBUG_FUNCPTR (gst_mad_get_event_masks));
-#endif
   gst_pad_set_query_function (mad->srcpad,
       GST_DEBUG_FUNCPTR (gst_mad_src_query));
   gst_pad_set_query_type_function (mad->srcpad,
@@ -427,17 +422,6 @@ gst_mad_get_formats (GstPad * pad)
 }
 #endif
 
-static const GstEventMask *
-gst_mad_get_event_masks (GstPad * pad)
-{
-  static const GstEventMask gst_mad_src_event_masks[] = {
-    {GST_EVENT_SEEK, GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH},
-    {0,}
-  };
-
-  return gst_mad_src_event_masks;
-}
-
 static gboolean
 gst_mad_convert_sink (GstPad * pad, GstFormat src_format, gint64 src_value,
     GstFormat * dest_format, gint64 * dest_value)
@@ -741,7 +725,6 @@ index_seek (GstMad * mad, GstPad * pad, GstEvent * event)
 static gboolean
 normal_seek (GstMad * mad, GstPad * pad, GstEvent * event)
 {
-  GstQuery *query;
   gint64 time_offset, bytes_offset;
   GstFormat format;
   guint flush;
@@ -1454,7 +1437,7 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
       }
 
       if (mad->check_for_xing) {
-        int bitrate, time;
+        int bitrate = 0, time = 0;
         GstTagList *list;
         int frame_len = mad->stream.next_frame - mad->stream.this_frame;