From: Benjamin Otte <otte@gnome.org>
Date: Thu, 22 Apr 2004 03:52:53 +0000 (+0000)
Subject: s/gst_caps_simplify/gst_caps_do_simplify/
X-Git-Tag: 1.19.3~511^2~14339
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29e86d64933efa3c8e441a71193f8e91edc9a96d;p=platform%2Fupstream%2Fgstreamer.git

s/gst_caps_simplify/gst_caps_do_simplify/

Original commit message from CVS:
* ext/hermes/gsthermescolorspace.c:
(gst_hermes_colorspace_caps_remove_format_info):
* gst/colorspace/gstcolorspace.c:
(gst_colorspace_caps_remove_format_info):
* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
(gst_ffmpegcolorspace_caps_remove_format_info):
s/gst_caps_simplify/gst_caps_do_simplify/
---

diff --git a/ChangeLog b/ChangeLog
index 24180cc..365086d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2004-04-22  Benjamin Otte  <otte@gnome.org>
 
+	* ext/hermes/gsthermescolorspace.c:
+	(gst_hermes_colorspace_caps_remove_format_info):
+	* gst/colorspace/gstcolorspace.c:
+	(gst_colorspace_caps_remove_format_info):
+	* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
+	(gst_ffmpegcolorspace_caps_remove_format_info):
+	  s/gst_caps_simplify/gst_caps_do_simplify/
+
+2004-04-22  Benjamin Otte  <otte@gnome.org>
+
 	* gst-libs/gst/riff/riff-media.c:
 	(gst_riff_create_video_caps_with_data):
 	  mpegversion is an int
diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
index 1960081..ce0f337 100644
--- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c
+++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
@@ -125,9 +125,8 @@ gst_ffmpegcolorspace_caps_remove_format_info (GstCaps * caps)
     gst_structure_remove_field (structure, "blue_mask");
   }
 
-  rgbcaps = gst_caps_simplify (caps);
-  gst_caps_free (caps);
-  caps = gst_caps_copy (rgbcaps);
+  gst_caps_do_simplify (caps);
+  rgbcaps = gst_caps_copy (caps);
 
   for (i = 0; i < gst_caps_get_size (rgbcaps); i++) {
     structure = gst_caps_get_structure (rgbcaps, i);