diff options
author | Andy Wingo <wingo@pobox.com> | 2005-07-04 09:29:51 +0000 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2005-07-04 09:29:51 +0000 |
commit | aedfb1663da6fad0fd09b7e9a3e7dc69eadd5e26 (patch) | |
tree | 61b0d85623e885c9f73b0f425c7187b857593db6 | |
parent | dc26238905599571dc79a3f7a2f61e766be3d797 (diff) |
ext/aalib/gstaasink.c (gst_aasink_fixate): Update for newer fixate prototype.
Original commit message from CVS:
2005-07-04 Andy Wingo <wingo@pobox.com>
* ext/aalib/gstaasink.c (gst_aasink_fixate): Update for newer
fixate prototype.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/aalib/gstaasink.c | 25 |
2 files changed, 10 insertions, 20 deletions
@@ -1,3 +1,8 @@ +2005-07-04 Andy Wingo <wingo@pobox.com> + + * ext/aalib/gstaasink.c (gst_aasink_fixate): Update for newer + fixate prototype. + 2005-07-03 Owen Fraser-Green <owen@discobabe.net> * gst/realmedia/rmdemux.c (gst_rmdemux_add_stream), diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c index e452dd8d..3bd0c997 100644 --- a/ext/aalib/gstaasink.c +++ b/ext/aalib/gstaasink.c @@ -230,31 +230,16 @@ gst_aasink_class_init (GstAASinkClass * klass) gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_aasink_render); } -static GstCaps * +static void gst_aasink_fixate (GstPad * pad, GstCaps * caps) { GstStructure *structure; - GstCaps *newcaps; - - if (gst_caps_get_size (caps) > 1) - return NULL; - newcaps = gst_caps_copy (caps); - structure = gst_caps_get_structure (newcaps, 0); - - if (gst_caps_structure_fixate_field_nearest_int (structure, "width", 320)) { - return newcaps; - } - if (gst_caps_structure_fixate_field_nearest_int (structure, "height", 240)) { - return newcaps; - } - if (gst_caps_structure_fixate_field_nearest_double (structure, "framerate", - 30.0)) { - return newcaps; - } + structure = gst_caps_get_structure (caps, 0); - gst_caps_unref (newcaps); - return NULL; + gst_caps_structure_fixate_field_nearest_int (structure, "width", 320); + gst_caps_structure_fixate_field_nearest_int (structure, "height", 240); + gst_caps_structure_fixate_field_nearest_double (structure, "framerate", 30.0); } static gboolean |