Global change from "caps2" to "caps". Script is: #!/bin/sh find . -name '*.[chy]' -exec perl -i -p \CAPS-ENDCAPS

Original commit message from CVS:
Global change from "caps2" to "caps".  Script is:
#!/bin/sh

find . -name '*.[chy]' -exec perl -i -p \
-e 's/gst_static_caps2_/gst_static_caps_/g;\
s/GST_CAPS2_/GST_CAPS_/g;\
s/gst_caps2_/gst_caps_/g;\
s/GstCaps2/GstCaps/g;\
s/GstStaticCaps2/GstStaticCaps/g;\
s/GST_STATIC_CAPS2_/GST_STATIC_CAPS_/g;\
s/GST_TYPE_CAPS2/GST_TYPE_CAPS/g;\
s/gst_caps_get_nth_cap/gst_caps_get_structure/g;\
s/gst_caps_get_n_structures/gst_caps_get_size/g;\
s/gst_caps_append_cap/gst_caps_append_structure/g;\
s/GST_CAPS2_/GST_CAPS_/g;' \
{} \;

1 files changed, 6 insertions, 6 deletions

diff --git a/testsuite/caps/union.c b/testsuite/caps/union.c
index a3ed4485a6..557cda4d08 100644
--- a/testsuite/caps/union.c
+++ b/testsuite/caps/union.c
@@ -1,7 +1,7 @@
 #include <gst/gst.h>
 
 /* these caps all have a non empty intersection */
-GstStaticCaps2 sinkcaps = GST_STATIC_CAPS (
+GstStaticCaps sinkcaps = GST_STATIC_CAPS (
   "video/mpeg, "
     "mpegtype:int=1, "
     "foo1:int=[20,40], "
@@ -9,7 +9,7 @@ GstStaticCaps2 sinkcaps = GST_STATIC_CAPS (
     "foo3:int=[10,20]"
 );
 
-GstStaticCaps2 mp1parsecaps = GST_STATIC_CAPS (
+GstStaticCaps mp1parsecaps = GST_STATIC_CAPS (
   "video/mpeg, "
     "mpegtype:int=1, "
     "foo1:int=30, "
@@ -22,17 +22,17 @@ main (int argc, char *argv[])
 {
   xmlDocPtr doc;
   xmlNodePtr parent;
-  GstCaps2 *caps;
+  GstCaps *caps;
 
   gst_init (&argc, &argv);
 
   doc = xmlNewDoc ("1.0");
   doc->xmlRootNode = xmlNewDocNode (doc, NULL, "Capabilities", NULL);
 
-  caps = gst_caps2_union (gst_static_caps2_get (&sinkcaps),
-      gst_static_caps2_get (&mp1parsecaps));
+  caps = gst_caps_union (gst_static_caps_get (&sinkcaps),
+      gst_static_caps_get (&mp1parsecaps));
   parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities1", NULL);
-  gst_caps2_save_thyself (caps, parent);
+  gst_caps_save_thyself (caps, parent);
 
   xmlDocDump(stdout, doc);