From 80dca40c3556d633e6cb3ea381de171bbaaaa609 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 12 Mar 2012 10:43:57 +0100
Subject: [PATCH] fix for _do_simplify changes

---
 gst/alpha/gstalphacolor.c     | 4 ++--
 gst/matroska/matroska-demux.c | 4 ++--
 sys/oss4/oss4-audio.c         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gst/alpha/gstalphacolor.c b/gst/alpha/gstalphacolor.c
index cdacf0a962..53cac25093 100644
--- a/gst/alpha/gstalphacolor.c
+++ b/gst/alpha/gstalphacolor.c
@@ -139,9 +139,9 @@ gst_alpha_color_transform_caps (GstBaseTransform * btrans,
   /* Intersect with our template caps */
   result = gst_caps_intersect (local_caps, tmpl_caps);
   gst_caps_unref (tmpl_caps);
-
   gst_caps_unref (local_caps);
-  gst_caps_do_simplify (result);
+
+  result = gst_caps_do_simplify (result);
 
   GST_LOG_OBJECT (btrans, "transformed %" GST_PTR_FORMAT " to %" GST_PTR_FORMAT,
       caps, result);
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 5086183a06..510f9da8e7 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -5074,7 +5074,7 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
         gst_structure_set (structure, "interlaced", G_TYPE_BOOLEAN, TRUE, NULL);
     }
 
-    gst_caps_do_simplify (caps);
+    caps = gst_caps_do_simplify (caps);
   }
 
   return caps;
@@ -5443,7 +5443,7 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext *
       }
     }
 
-    gst_caps_do_simplify (caps);
+    caps = gst_caps_do_simplify (caps);
   }
 
   return caps;
diff --git a/sys/oss4/oss4-audio.c b/sys/oss4/oss4-audio.c
index 6317400dc5..c788a13807 100644
--- a/sys/oss4/oss4-audio.c
+++ b/sys/oss4/oss4-audio.c
@@ -458,7 +458,7 @@ gst_oss4_audio_probe_caps (GstObject * obj, int fd)
     }
   }
 
-  gst_caps_do_simplify (caps);
+  caps = gst_caps_do_simplify (caps);
   GST_LOG_OBJECT (obj, "formats: %" GST_PTR_FORMAT, caps);
 
   if (!gst_oss4_audio_detect_rates (obj, &ai, caps))
@@ -505,7 +505,7 @@ gst_oss4_audio_get_template_caps (void)
     gst_oss4_append_format_to_caps (&fmt_map[i], caps);
   }
 
-  gst_caps_do_simplify (caps);
+  caps = gst_caps_do_simplify (caps);
 
   for (i = 0; i < gst_caps_get_size (caps); ++i) {
     GstStructure *s;