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.

diff --git a/ChangeLog b/ChangeLog
index d86153feb875aec459f625c0028c636dd3f4efbe..1e9ce78148da2f42c39d4154b6f11d0d9f9971ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 e452dd8d8a62ab452b1293906ad13de8910bb473..3bd0c99784958d4ee5f68212bb342e8acbf20fdf 100644 (file)
--- 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