gst/: Don't call gst_caps_do_simplify - it doesn't respect order of caps and it's...

Original commit message from CVS:

* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps):
* gst/gstcaps.c: (gst_caps_intersect):
Don't call gst_caps_do_simplify - it doesn't respect order of caps
and it's not needed.

diff --git a/ChangeLog b/ChangeLog
index fe268c3..631192f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-10  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst/base/gstbasetransform.c: (gst_base_transform_transform_caps):
+       * gst/gstcaps.c: (gst_caps_intersect):
+         Don't call gst_caps_do_simplify - it doesn't respect order of caps
+         and it's not needed.
+
 2005-11-10  Wim Taymans  <wim@fluendo.com>
 
        * docs/design/part-TODO.txt:

diff --git a/gst/base/gstbasetransform.c b/gst/base/gstbasetransform.c
index 0bc1a08..d097c97 100644 (file)
--- a/gst/base/gstbasetransform.c
+++ b/gst/base/gstbasetransform.c
@@ -406,7 +406,6 @@ gst_base_transform_transform_caps (GstBaseTransform * trans,
         gst_caps_append (ret, temp);
       }
     }
-    gst_caps_do_simplify (ret);
   } else {
     /* else use the identity transform */
     ret = gst_caps_ref (caps);

diff --git a/gst/gstcaps.c b/gst/gstcaps.c
index 45dc2f2..e5229cb 100644 (file)
--- a/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@ -1054,7 +1054,6 @@ gst_caps_intersect (const GstCaps * caps1, const GstCaps * caps2)
       j--;
     }
   }
-  gst_caps_do_simplify (dest);
   return dest;
 }
 

diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index 0bc1a08..d097c97 100644 (file)
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -406,7 +406,6 @@ gst_base_transform_transform_caps (GstBaseTransform * trans,
         gst_caps_append (ret, temp);
       }
     }
-    gst_caps_do_simplify (ret);
   } else {
     /* else use the identity transform */
     ret = gst_caps_ref (caps);