summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2003-12-24 17:01:00 +0000
committerColin Walters <walters@verbum.org>2003-12-24 17:01:00 +0000
commitc2f54315b1f6fb4c1694505c1c0dcc54d77a3cf5 (patch)
treef933b883d4f0ae27ca319067bc801f16043cfab2
parentd88e52a37b8375cae2c8558f786882eb4bd12e84 (diff)
Return NULL if we can't fixate the caps anymore.
Original commit message from CVS: Return NULL if we can't fixate the caps anymore.
-rw-r--r--ChangeLog5
-rw-r--r--sys/oss/gstosssink.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fa878b55..52109b89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-24 Colin Walters <walters@verbum.org>
+
+ * sys/oss/gstosssink.c (gst_osssink_sink_fixate): Return NULL if
+ we can't fixate the caps anymore.
+
2003-12-23 David Schleef <ds@schleef.org>
* gst/volume/gstvolume.c: (volume_init): Proxy getcaps.
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index 9985427c..96ed3d1a 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -237,7 +237,9 @@ gst_osssink_sink_fixate (GstPad *pad, const GstCaps *caps, gpointer user_data)
return newcaps;
}
- return newcaps;
+ gst_caps_free (newcaps);
+
+ return NULL;
}
static GstPadLinkReturn