diff options
| author | David Schleef <ds@schleef.org> | 2003-12-21 23:24:38 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-21 23:24:38 +0000 |
| commit | 8284d0d3a2911a9ef9667aa52f0fd42e4c93405f (patch) | |
| tree | 5fa53a115231b29afd0bc832f9c32afdd8dd51c7 /ext/xvid | |
| parent | 26da56b423a834192f5edf413c3cb1be257f845a (diff) | |
| download | gst-plugins-bad-8284d0d3a2911a9ef9667aa52f0fd42e4c93405f.tar.gz gst-plugins-bad-8284d0d3a2911a9ef9667aa52f0fd42e4c93405f.tar.bz2 gst-plugins-bad-8284d0d3a2911a9ef9667aa52f0fd42e4c93405f.zip | |
Original commit message from CVS:
Global change from "caps2" to "caps"
Diffstat (limited to 'ext/xvid')
| -rw-r--r-- | ext/xvid/gstxviddec.c | 12 | ||||
| -rw-r--r-- | ext/xvid/gstxvidenc.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c index afc12343..84af838d 100644 --- a/ext/xvid/gstxviddec.c +++ b/ext/xvid/gstxviddec.c @@ -77,7 +77,7 @@ static void gst_xviddec_dispose (GObject *object); static void gst_xviddec_chain (GstPad *pad, GstData *data); static GstPadLinkReturn gst_xviddec_link (GstPad *pad, - const GstCaps2 *vscapslist); + const GstCaps *vscapslist); static GstPadLinkReturn gst_xviddec_negotiate (GstXvidDec *xviddec); static GstElementClass *parent_class = NULL; @@ -263,7 +263,7 @@ static GstPadLinkReturn gst_xviddec_negotiate (GstXvidDec *xviddec) { GstPadLinkReturn ret; - GstCaps2 *caps; + GstCaps *caps; struct { guint32 fourcc; gint depth, bpp; @@ -307,7 +307,7 @@ gst_xviddec_negotiate (GstXvidDec *xviddec) r_mask = R_MASK_32_INT; g_mask = G_MASK_32_INT; b_mask = B_MASK_32_INT; break; } - caps = gst_caps2_new_simple ( + caps = gst_caps_new_simple ( "video/x-raw-rgb", "width", G_TYPE_INT, xviddec->width, "height", G_TYPE_INT, xviddec->height, @@ -320,7 +320,7 @@ gst_xviddec_negotiate (GstXvidDec *xviddec) "framerate", G_TYPE_DOUBLE, xviddec->fps, NULL); } else { - caps = gst_caps2_new_simple ( + caps = gst_caps_new_simple ( "video/x-raw-yuv", "width", G_TYPE_INT, xviddec->width, "height", G_TYPE_INT, xviddec->height, @@ -346,7 +346,7 @@ gst_xviddec_negotiate (GstXvidDec *xviddec) static GstPadLinkReturn gst_xviddec_link (GstPad *pad, - const GstCaps2 *vscaps) + const GstCaps *vscaps) { GstXvidDec *xviddec; GstStructure *structure; @@ -360,7 +360,7 @@ gst_xviddec_link (GstPad *pad, /* if we get here, we know the input is xvid. we * only need to bother with the output colorspace */ - structure = gst_caps2_get_nth_cap (vscaps, 0); + structure = gst_caps_get_structure (vscaps, 0); gst_structure_get_int(structure, "width", &xviddec->width); gst_structure_get_int(structure, "height", &xviddec->height); gst_structure_get_double(structure, "framerate", &xviddec->fps); diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c index e3cad294..ce2e71e9 100644 --- a/ext/xvid/gstxvidenc.c +++ b/ext/xvid/gstxvidenc.c @@ -79,7 +79,7 @@ static void gst_xvidenc_init (GstXvidEnc *xvidenc); static void gst_xvidenc_chain (GstPad *pad, GstData *data); static GstPadLinkReturn gst_xvidenc_link (GstPad *pad, - const GstCaps2 *vscapslist); + const GstCaps *vscapslist); /* properties */ static void gst_xvidenc_set_property (GObject *object, @@ -298,7 +298,7 @@ gst_xvidenc_chain (GstPad *pad, static GstPadLinkReturn gst_xvidenc_link (GstPad *pad, - const GstCaps2 *vscaps) + const GstCaps *vscaps) { GstXvidEnc *xvidenc; GstStructure *structure; @@ -315,8 +315,8 @@ gst_xvidenc_link (GstPad *pad, xvidenc->handle = NULL; } - g_return_val_if_fail (gst_caps2_get_n_structures (vscaps) == 1, GST_PAD_LINK_REFUSED); - structure = gst_caps2_get_nth_cap (vscaps, 0); + g_return_val_if_fail (gst_caps_get_size (vscaps) == 1, GST_PAD_LINK_REFUSED); + structure = gst_caps_get_structure (vscaps, 0); gst_structure_get_int (structure, "width", &w); gst_structure_get_int (structure, "height", &h); @@ -372,9 +372,9 @@ gst_xvidenc_link (GstPad *pad, if (gst_xvidenc_setup(xvidenc)) { GstPadLinkReturn ret; - GstCaps2 *new_caps; + GstCaps *new_caps; - new_caps = gst_caps2_new_simple( + new_caps = gst_caps_new_simple( "video/x-xvid", "width", G_TYPE_INT, w, "height", G_TYPE_INT, h, |