From 12dab04a2d4bee76d25e8befaea7044103700264 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 29 Jun 2005 16:36:15 +0000 Subject: [PATCH] ext/mad/gstid3tag.c (gst_id3_tag_get_event_masks): Reschmoove. Original commit message from CVS: 2005-06-29 Andy Wingo * 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. --- ext/aalib/gstaasink.c | 4 ++-- ext/libcaca/gstcacasink.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c index 7434977..e452dd8 100644 --- a/ext/aalib/gstaasink.c +++ b/ext/aalib/gstaasink.c @@ -253,7 +253,7 @@ gst_aasink_fixate (GstPad * pad, GstCaps * caps) return newcaps; } - gst_caps_free (newcaps); + gst_caps_unref (newcaps); return NULL; } @@ -305,7 +305,7 @@ gst_aasink_init (GstAASink * aasink) } static void -gst_aasink_scale (GstAASink * aasink, gchar * src, gchar * dest, +gst_aasink_scale (GstAASink * aasink, guchar * src, guchar * dest, gint sw, gint sh, gint dw, gint dh) { gint ypos, yinc, y; diff --git a/ext/libcaca/gstcacasink.c b/ext/libcaca/gstcacasink.c index e9c788d..91b5eb6 100644 --- a/ext/libcaca/gstcacasink.c +++ b/ext/libcaca/gstcacasink.c @@ -194,10 +194,11 @@ gst_cacasink_setcaps (GstBaseSink * basesink, GstCaps * caps) structure = gst_caps_get_structure (caps, 0); gst_structure_get_int (structure, "width", &(cacasink->width)); gst_structure_get_int (structure, "height", &(cacasink->height)); - gst_structure_get_int (structure, "bpp", &cacasink->bpp); - gst_structure_get_int (structure, "red_mask", &cacasink->red_mask); - gst_structure_get_int (structure, "green_mask", &cacasink->green_mask); - gst_structure_get_int (structure, "blue_mask", &cacasink->blue_mask); + gst_structure_get_int (structure, "bpp", (int *) &cacasink->bpp); + gst_structure_get_int (structure, "red_mask", (int *) &cacasink->red_mask); + gst_structure_get_int (structure, "green_mask", + (int *) &cacasink->green_mask); + gst_structure_get_int (structure, "blue_mask", (int *) &cacasink->blue_mask); if (cacasink->bpp == 24) { cacasink->red_mask = GUINT32_FROM_BE (cacasink->red_mask) >> 8; -- 2.7.4