vdpau: fixup renaming

the rename work done in commit 24cf84d06b2f4b2edec3383b198441a07829618b didn't
include typecasts. This commit fixes this.

10 files changed, 63 insertions, 65 deletions

diff --git a/sys/vdpau/gstvdpdecoder.c b/sys/vdpau/gstvdpdecoder.c
index dafcec98..3f71ab40 100644
--- a/sys/vdpau/gstvdpdecoder.c
+++ b/sys/vdpau/gstvdpdecoder.c
@@ -83,7 +83,7 @@ gst_vdp_decoder_change_state (GstElement * element, GstStateChange transition)
 {
   GstVdpDecoder *dec;
 
-  dec = GST_VDPAU_DECODER (element);
+  dec = GST_VDP_DECODER (element);
 
   switch (transition) {
     case GST_STATE_CHANGE_NULL_TO_READY:
@@ -103,8 +103,8 @@ gst_vdp_decoder_change_state (GstElement * element, GstStateChange transition)
 static gboolean
 gst_vdp_decoder_sink_set_caps (GstPad * pad, GstCaps * caps)
 {
-  GstVdpDecoder *dec = GST_VDPAU_DECODER (GST_OBJECT_PARENT (pad));
-  GstVdpDecoderClass *dec_class = GST_VDPAU_DECODER_GET_CLASS (dec);
+  GstVdpDecoder *dec = GST_VDP_DECODER (GST_OBJECT_PARENT (pad));
+  GstVdpDecoderClass *dec_class = GST_VDP_DECODER_GET_CLASS (dec);
 
   GstCaps *src_caps, *new_caps;
   GstStructure *structure;
@@ -227,7 +227,7 @@ static void
 gst_vdp_decoder_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
-  GstVdpDecoder *dec = GST_VDPAU_DECODER (object);
+  GstVdpDecoder *dec = GST_VDP_DECODER (object);
 
   switch (prop_id) {
     case PROP_DISPLAY:
@@ -244,7 +244,7 @@ static void
 gst_vdp_decoder_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec)
 {
-  GstVdpDecoder *dec = GST_VDPAU_DECODER (object);
+  GstVdpDecoder *dec = GST_VDP_DECODER (object);
 
   switch (prop_id) {
     case PROP_DISPLAY:
diff --git a/sys/vdpau/gstvdpdecoder.h b/sys/vdpau/gstvdpdecoder.h
index 8dc4ad66..dfc63fd9 100644
--- a/sys/vdpau/gstvdpdecoder.h
+++ b/sys/vdpau/gstvdpdecoder.h
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#ifndef __GST_VDPAU_DECODER_H__
-#define __GST_VDPAU_DECODER_H__
+#ifndef __GST_VDP_DECODER_H__
+#define __GST_VDP_DECODER_H__
 
 #include <gst/gst.h>
 
@@ -29,9 +29,9 @@
 G_BEGIN_DECLS
 
 #define GST_TYPE_VDPAU_DECODER            (gst_vdp_decoder_get_type())
-#define GST_VDPAU_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDPAU_DECODER,GstVdpDecoder))
-#define GST_VDPAU_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDPAU_DECODER,GstVdpDecoderClass))
-#define GST_VDPAU_DECODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDPAU_DECODER, GstVdpDecoderClass))
+#define GST_VDP_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDPAU_DECODER,GstVdpDecoder))
+#define GST_VDP_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDPAU_DECODER,GstVdpDecoderClass))
+#define GST_VDP_DECODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDPAU_DECODER, GstVdpDecoderClass))
 #define GST_IS_VDPAU_DECODER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VDPAU_DECODER))
 #define GST_IS_VDPAU_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VDPAU_DECODER))
 
@@ -69,4 +69,4 @@ VdpVideoSurface gst_vdp_decoder_create_video_surface (GstVdpDecoder *dec);
 
 G_END_DECLS
 
-#endif /* __GST_VDPAU_DECODER_H__ */
+#endif /* __GST_VDP_DECODER_H__ */
diff --git a/sys/vdpau/gstvdpdevice.h b/sys/vdpau/gstvdpdevice.h
index 8b2f596c..26e7fa72 100644
--- a/sys/vdpau/gstvdpdevice.h
+++ b/sys/vdpau/gstvdpdevice.h
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef _GST_VDPAU_DEVICE_H_
-#define _GST_VDPAU_DEVICE_H_
+#ifndef _GST_VDP_DEVICE_H_
+#define _GST_VDP_DEVICE_H_
 
 #include <X11/Xlib.h>
 #include <vdpau/vdpau.h>
@@ -29,11 +29,11 @@
 G_BEGIN_DECLS
 
 #define GST_TYPE_VDPAU_DEVICE             (gst_vdp_device_get_type ())
-#define GST_VDPAU_DEVICE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VDPAU_DEVICE, GstVdpDevice))
-#define GST_VDPAU_DEVICE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VDPAU_DEVICE, GstVdpDeviceClass))
+#define GST_VDP_DEVICE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VDPAU_DEVICE, GstVdpDevice))
+#define GST_VDP_DEVICE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VDPAU_DEVICE, GstVdpDeviceClass))
 #define GST_IS_VDPAU_DEVICE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VDPAU_DEVICE))
 #define GST_IS_VDPAU_DEVICE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_VDPAU_DEVICE))
-#define GST_VDPAU_DEVICE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDPAU_DEVICE, GstVdpDeviceClass))
+#define GST_VDP_DEVICE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDPAU_DEVICE, GstVdpDeviceClass))
 
 typedef struct _GstVdpDeviceClass GstVdpDeviceClass;
 typedef struct _GstVdpDevice GstVdpDevice;
@@ -129,4 +129,4 @@ GstVdpDevice *gst_vdp_get_device (const gchar *display_name);
 
 G_END_DECLS
 
-#endif /* _GST_VDPAU_DEVICE_H_ */
+#endif /* _GST_VDP_DEVICE_H_ */
diff --git a/sys/vdpau/gstvdpmpegdecoder.c b/sys/vdpau/gstvdpmpegdecoder.c
index 42c89a32..f13db895 100644
--- a/sys/vdpau/gstvdpmpegdecoder.c
+++ b/sys/vdpau/gstvdpmpegdecoder.c
@@ -92,7 +92,7 @@ gst_vdp_mpeg_decoder_set_caps (GstVdpDecoder * dec, GstCaps * caps)
   GstVdpDevice *device;
   VdpStatus status;
 
-  mpeg_dec = GST_VDPAU_MPEG_DECODER (dec);
+  mpeg_dec = GST_VDP_MPEG_DECODER (dec);
 
   structure = gst_caps_get_structure (caps, 0);
   gst_structure_get_int (structure, "mpegversion", &mpeg_dec->version);
@@ -150,7 +150,7 @@ gst_vdp_mpeg_decoder_decode (GstVdpMpegDecoder * mpeg_dec)
   VdpStatus status;
   GstFlowReturn ret;
 
-  dec = GST_VDPAU_DECODER (mpeg_dec);
+  dec = GST_VDP_DECODER (mpeg_dec);
 
   buffer = gst_adapter_take_buffer (mpeg_dec->adapter,
       gst_adapter_available (mpeg_dec->adapter));
@@ -234,8 +234,7 @@ gst_vdp_mpeg_decoder_decode (GstVdpMpegDecoder * mpeg_dec)
                 device->vdp_get_error_string (status)));
       }
 
-      gst_vdp_decoder_push_video_buffer (GST_VDPAU_DECODER (mpeg_dec),
-          b_outbuf);
+      gst_vdp_decoder_push_video_buffer (GST_VDP_DECODER (mpeg_dec), b_outbuf);
     }
     g_slist_free (mpeg_dec->b_frames);
     mpeg_dec->b_frames = NULL;
@@ -243,8 +242,7 @@ gst_vdp_mpeg_decoder_decode (GstVdpMpegDecoder * mpeg_dec)
 
   gst_buffer_ref (GST_BUFFER (outbuf));
 
-  ret = gst_vdp_decoder_push_video_buffer (GST_VDPAU_DECODER (mpeg_dec),
-      outbuf);
+  ret = gst_vdp_decoder_push_video_buffer (GST_VDP_DECODER (mpeg_dec), outbuf);
 
   if (mpeg_dec->vdp_info.forward_reference != VDP_INVALID_HANDLE)
     gst_buffer_unref (mpeg_dec->f_buffer);
@@ -263,7 +261,7 @@ gst_vdp_mpeg_decoder_parse_picture_coding (GstVdpMpegDecoder * mpeg_dec,
   MPEGPictureExt pic_ext;
   VdpPictureInfoMPEG1Or2 *info;
 
-  dec = GST_VDPAU_DECODER (mpeg_dec);
+  dec = GST_VDP_DECODER (mpeg_dec);
   info = &mpeg_dec->vdp_info;
 
   if (!mpeg_util_parse_picture_coding_extension (&pic_ext, data, end))
@@ -290,7 +288,7 @@ gst_vdp_mpeg_decoder_parse_sequence (GstVdpMpegDecoder * mpeg_dec,
   GstVdpDecoder *dec;
   MPEGSeqHdr hdr;
 
-  dec = GST_VDPAU_DECODER (mpeg_dec);
+  dec = GST_VDP_DECODER (mpeg_dec);
 
   if (!mpeg_util_parse_sequence_hdr (&hdr, data, end))
     return FALSE;
@@ -310,7 +308,7 @@ gst_vdp_mpeg_decoder_parse_picture (GstVdpMpegDecoder * mpeg_dec,
   GstVdpDecoder *dec;
   MPEGPictureHdr pic_hdr;
 
-  dec = GST_VDPAU_DECODER (mpeg_dec);
+  dec = GST_VDP_DECODER (mpeg_dec);
 
   if (!mpeg_util_parse_picture_hdr (&pic_hdr, data, end))
     return FALSE;
@@ -392,7 +390,7 @@ gst_vdp_mpeg_decoder_chain (GstPad * pad, GstBuffer * buffer)
   guint32 sync_word = 0xffffffff;
   GstFlowReturn ret = GST_FLOW_OK;
 
-  mpeg_dec = GST_VDPAU_MPEG_DECODER (GST_OBJECT_PARENT (pad));
+  mpeg_dec = GST_VDP_MPEG_DECODER (GST_OBJECT_PARENT (pad));
 
   if (G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT))) {
     GST_DEBUG_OBJECT (mpeg_dec, "Received discont buffer");
@@ -474,8 +472,8 @@ gst_vdp_mpeg_decoder_sink_event (GstPad * pad, GstEvent * event)
   GstVdpDecoder *dec;
   gboolean res;
 
-  mpeg_dec = GST_VDPAU_MPEG_DECODER (GST_OBJECT_PARENT (pad));
-  dec = GST_VDPAU_DECODER (mpeg_dec);
+  mpeg_dec = GST_VDP_MPEG_DECODER (GST_OBJECT_PARENT (pad));
+  dec = GST_VDP_DECODER (mpeg_dec);
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_FLUSH_STOP:
@@ -553,7 +551,7 @@ gst_vdp_mpeg_decoder_init (GstVdpMpegDecoder * mpeg_dec,
 {
   GstVdpDecoder *dec;
 
-  dec = GST_VDPAU_DECODER (mpeg_dec);
+  dec = GST_VDP_DECODER (mpeg_dec);
 
   mpeg_dec->decoder = VDP_INVALID_HANDLE;
   gst_vdp_mpeg_decoder_init_info (&mpeg_dec->vdp_info);
diff --git a/sys/vdpau/gstvdpmpegdecoder.h b/sys/vdpau/gstvdpmpegdecoder.h
index aac79f31..ee7086c5 100644
--- a/sys/vdpau/gstvdpmpegdecoder.h
+++ b/sys/vdpau/gstvdpmpegdecoder.h
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GST_VDPAU_MPEG_DECODER_H__
-#define __GST_VDPAU_MPEG_DECODER_H__
+#ifndef __GST_VDP_MPEG_DECODER_H__
+#define __GST_VDP_MPEG_DECODER_H__
 
 #include <gst/gst.h>
 #include <gst/base/gstadapter.h>
@@ -29,8 +29,8 @@
 G_BEGIN_DECLS
 
 #define GST_TYPE_VDPAU_MPEG_DECODER            (gst_vdp_mpeg_decoder_get_type())
-#define GST_VDPAU_MPEG_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDPAU_MPEG_DECODER,GstVdpMpegDecoder))
-#define GST_VDPAU_MPEG_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDPAU_MPEG_DECODER,GstVdpMpegDecoderClass))
+#define GST_VDP_MPEG_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDPAU_MPEG_DECODER,GstVdpMpegDecoder))
+#define GST_VDP_MPEG_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDPAU_MPEG_DECODER,GstVdpMpegDecoderClass))
 #define GST_IS_VDPAU_MPEG_DECODER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VDPAU_MPEG_DECODER))
 #define GST_IS_VDPAU_MPEG_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VDPAU_MPEG_DECODER))
 
@@ -64,4 +64,4 @@ GType gst_vdp_mpeg_decoder_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GST_VDPAU_MPEG_DECODER_H__ */
+#endif /* __GST_VDP_MPEG_DECODER_H__ */
diff --git a/sys/vdpau/gstvdpvideobuffer.h b/sys/vdpau/gstvdpvideobuffer.h
index bbfc7af0..92a077f8 100644
--- a/sys/vdpau/gstvdpvideobuffer.h
+++ b/sys/vdpau/gstvdpvideobuffer.h
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef _GST_VDPAU_VIDEO_BUFFER_H_
-#define _GST_VDPAU_VIDEO_BUFFER_H_
+#ifndef _GST_VDP_VIDEO_BUFFER_H_
+#define _GST_VDP_VIDEO_BUFFER_H_
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
@@ -33,7 +33,7 @@ typedef struct _GstVdpVideoBuffer GstVdpVideoBuffer;
 #define GST_TYPE_VDPAU_VIDEO_BUFFER (gst_vdp_video_buffer_get_type())
 
 #define GST_IS_VDPAU_VIDEO_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VDPAU_VIDEO_BUFFER))
-#define GST_VDPAU_VIDEO_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VDPAU_VIDEO_BUFFER, GstVdpVideoBuffer))
+#define GST_VDP_VIDEO_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VDPAU_VIDEO_BUFFER, GstVdpVideoBuffer))
 
 struct _GstVdpVideoBuffer {
   GstBuffer buffer;
@@ -46,7 +46,7 @@ GType gst_vdp_video_buffer_get_type (void);
 
 GstVdpVideoBuffer* gst_vdp_video_buffer_new (GstVdpDevice * device, VdpChromaType chroma_type, gint width, gint height);
 
-#define GST_VDPAU_VIDEO_CAPS \
+#define GST_VDP_VIDEO_CAPS \
   "video/x-vdpau-video, " \
   "chroma-type = (int)[0,2], " \
   "width = (int)[1,4096], " \
diff --git a/sys/vdpau/gstvdpvideoyuv.c b/sys/vdpau/gstvdpvideoyuv.c
index 917a4edc..a1f5b6ed 100644
--- a/sys/vdpau/gstvdpvideoyuv.c
+++ b/sys/vdpau/gstvdpvideoyuv.c
@@ -46,7 +46,7 @@ enum
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VDPAU_VIDEO_CAPS));
+    GST_STATIC_CAPS (GST_VDP_VIDEO_CAPS));
 
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -75,9 +75,9 @@ gst_vdp_video_yuv_chain (GstPad * pad, GstBuffer * buffer)
   VdpVideoSurface surface;
   GstBuffer *outbuf = NULL;
 
-  video_yuv = GST_VDPAU_VIDEO_YUV (GST_OBJECT_PARENT (pad));
-  device = GST_VDPAU_VIDEO_BUFFER (buffer)->device;
-  surface = GST_VDPAU_VIDEO_BUFFER (buffer)->surface;
+  video_yuv = GST_VDP_VIDEO_YUV (GST_OBJECT_PARENT (pad));
+  device = GST_VDP_VIDEO_BUFFER (buffer)->device;
+  surface = GST_VDP_VIDEO_BUFFER (buffer)->surface;
 
   switch (video_yuv->format) {
     case GST_MAKE_FOURCC ('Y', 'V', '1', '2'):
@@ -276,7 +276,7 @@ gst_vdp_video_yuv_get_caps (GstVdpVideoYUV * video_yuv,
 static gboolean
 gst_vdp_video_yuv_sink_set_caps (GstPad * pad, GstCaps * caps)
 {
-  GstVdpVideoYUV *video_yuv = GST_VDPAU_VIDEO_YUV (GST_OBJECT_PARENT (pad));
+  GstVdpVideoYUV *video_yuv = GST_VDP_VIDEO_YUV (GST_OBJECT_PARENT (pad));
 
   GstCaps *src_caps, *new_caps;
   GstStructure *structure;
@@ -344,7 +344,7 @@ gst_vdp_video_yuv_src_getcaps (GstPad * pad)
 {
   GstVdpVideoYUV *video_yuv;
 
-  video_yuv = GST_VDPAU_VIDEO_YUV (GST_OBJECT_PARENT (pad));
+  video_yuv = GST_VDP_VIDEO_YUV (GST_OBJECT_PARENT (pad));
 
   if (video_yuv->src_caps)
     return gst_caps_copy (video_yuv->src_caps);
diff --git a/sys/vdpau/gstvdpvideoyuv.h b/sys/vdpau/gstvdpvideoyuv.h
index f2aa4c82..eb628352 100644
--- a/sys/vdpau/gstvdpvideoyuv.h
+++ b/sys/vdpau/gstvdpvideoyuv.h
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#ifndef __GST_VDPAU_VIDEO_YUV_H__
-#define __GST_VDPAU_VIDEO_YUV_H__
+#ifndef __GST_VDP_VIDEO_YUV_H__
+#define __GST_VDP_VIDEO_YUV_H__
 
 #include <gst/gst.h>
 
@@ -28,9 +28,9 @@
 G_BEGIN_DECLS
 
 #define GST_TYPE_VDPAU_VIDEO_YUV            (gst_vdp_video_yuv_get_type())
-#define GST_VDPAU_VIDEO_YUV(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDPAU_VIDEO_YUV,GstVdpVideoYUV))
-#define GST_VDPAU_VIDEO_YUV_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDPAU_VIDEO_YUV,GstVdpVideoYUVClass))
-#define GST_VDPAU_VIDEO_YUV_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDPAU_VIDEO_YUV, GstVdpVideoYUVClass))
+#define GST_VDP_VIDEO_YUV(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDPAU_VIDEO_YUV,GstVdpVideoYUV))
+#define GST_VDP_VIDEO_YUV_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDPAU_VIDEO_YUV,GstVdpVideoYUVClass))
+#define GST_VDP_VIDEO_YUV_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDPAU_VIDEO_YUV, GstVdpVideoYUVClass))
 #define GST_IS_VDPAU_VIDEO_YUV(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VDPAU_VIDEO_YUV))
 #define GST_IS_VDPAU_VIDEO_YUV_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VDPAU_VIDEO_YUV))
 
@@ -57,4 +57,4 @@ GType gst_vdp_video_yuv_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GST_VDPAU_VIDEO_YUV_H__ */
+#endif /* __GST_VDP_VIDEO_YUV_H__ */
diff --git a/sys/vdpau/gstvdpyuvvideo.c b/sys/vdpau/gstvdpyuvvideo.c
index d5ed01cb..72c053e6 100644
--- a/sys/vdpau/gstvdpyuvvideo.c
+++ b/sys/vdpau/gstvdpyuvvideo.c
@@ -54,7 +54,7 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VDPAU_VIDEO_CAPS));
+    GST_STATIC_CAPS (GST_VDP_VIDEO_CAPS));
 
 #define DEBUG_INIT(bla) \
     GST_DEBUG_CATEGORY_INIT (gst_vdp_yuv_video_debug, "vdpauvideoyuv", 0, "YUV to VDPAU video surface");
@@ -76,13 +76,13 @@ gst_vdp_yuv_video_chain (GstPad * pad, GstBuffer * buffer)
   VdpVideoSurface surface;
   GstBuffer *outbuf = NULL;
 
-  yuv_video = GST_VDPAU_YUV_VIDEO (GST_OBJECT_PARENT (pad));
+  yuv_video = GST_VDP_YUV_VIDEO (GST_OBJECT_PARENT (pad));
   device = yuv_video->device;
 
   outbuf =
       GST_BUFFER (gst_vdp_video_buffer_new (device, yuv_video->chroma_type,
           yuv_video->width, yuv_video->height));
-  surface = GST_VDPAU_VIDEO_BUFFER (outbuf)->surface;
+  surface = GST_VDP_VIDEO_BUFFER (outbuf)->surface;
 
   switch (yuv_video->format) {
     case GST_MAKE_FOURCC ('Y', 'V', '1', '2'):
@@ -267,7 +267,7 @@ error:
 static gboolean
 gst_vdp_yuv_video_sink_setcaps (GstPad * pad, GstCaps * caps)
 {
-  GstVdpYUVVideo *yuv_video = GST_VDPAU_YUV_VIDEO (GST_OBJECT_PARENT (pad));
+  GstVdpYUVVideo *yuv_video = GST_VDP_YUV_VIDEO (GST_OBJECT_PARENT (pad));
 
   GstStructure *structure;
   guint32 fourcc;
@@ -337,7 +337,7 @@ gst_vdp_yuv_video_sink_getcaps (GstPad * pad)
 {
   GstVdpYUVVideo *yuv_video;
 
-  yuv_video = GST_VDPAU_YUV_VIDEO (GST_OBJECT_PARENT (pad));
+  yuv_video = GST_VDP_YUV_VIDEO (GST_OBJECT_PARENT (pad));
 
   if (yuv_video->sink_caps)
     return gst_caps_copy (yuv_video->sink_caps);
@@ -350,7 +350,7 @@ gst_vdp_yuv_video_change_state (GstElement * element, GstStateChange transition)
 {
   GstVdpYUVVideo *yuv_video;
 
-  yuv_video = GST_VDPAU_YUV_VIDEO (element);
+  yuv_video = GST_VDP_YUV_VIDEO (element);
 
   switch (transition) {
     case GST_STATE_CHANGE_NULL_TO_READY:
@@ -446,7 +446,7 @@ static void
 gst_vdp_yuv_video_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
-  GstVdpYUVVideo *yuv_video = GST_VDPAU_YUV_VIDEO (object);
+  GstVdpYUVVideo *yuv_video = GST_VDP_YUV_VIDEO (object);
 
   switch (prop_id) {
     case PROP_DISPLAY:
@@ -463,7 +463,7 @@ static void
 gst_vdp_yuv_video_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec)
 {
-  GstVdpYUVVideo *yuv_video = GST_VDPAU_YUV_VIDEO (object);
+  GstVdpYUVVideo *yuv_video = GST_VDP_YUV_VIDEO (object);
 
   switch (prop_id) {
     case PROP_DISPLAY:
diff --git a/sys/vdpau/gstvdpyuvvideo.h b/sys/vdpau/gstvdpyuvvideo.h
index fbb7d96d..0c063929 100644
--- a/sys/vdpau/gstvdpyuvvideo.h
+++ b/sys/vdpau/gstvdpyuvvideo.h
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#ifndef __GST_VDPAU_YUV_VIDEO_H__
-#define __GST_VDPAU_YUV_VIDEO_H__
+#ifndef __GST_VDP_YUV_VIDEO_H__
+#define __GST_VDP_YUV_VIDEO_H__
 
 #include <gst/gst.h>
 
@@ -28,9 +28,9 @@
 G_BEGIN_DECLS
 
 #define GST_TYPE_VDPAU_YUV_VIDEO            (gst_vdp_yuv_video_get_type())
-#define GST_VDPAU_YUV_VIDEO(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDPAU_YUV_VIDEO,GstVdpYUVVideo))
-#define GST_VDPAU_YUV_VIDEO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDPAU_YUV_VIDEO,GstVdpYUVVideoClass))
-#define GST_VDPAU_YUV_VIDEO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDPAU_YUV_VIDEO, GstVdpYUVVideoClass))
+#define GST_VDP_YUV_VIDEO(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDPAU_YUV_VIDEO,GstVdpYUVVideo))
+#define GST_VDP_YUV_VIDEO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDPAU_YUV_VIDEO,GstVdpYUVVideoClass))
+#define GST_VDP_YUV_VIDEO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDPAU_YUV_VIDEO, GstVdpYUVVideoClass))
 #define GST_IS_VDPAU_YUV_VIDEO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VDPAU_YUV_VIDEO))
 #define GST_IS_VDPAU_YUV_VIDEO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VDPAU_YUV_VIDEO))
 
@@ -59,4 +59,4 @@ GType gst_vdp_yuv_video_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GST_VDPAU_YUV_VIDEO_H__ */
+#endif /* __GST_VDP_YUV_VIDEO_H__ */