From: Luca Barbato <lu_zero@gentoo.org>
Date: Wed, 10 Jul 2013 18:27:03 +0000 (+0200)
Subject: vdpau: use the correct namespace for the union
X-Git-Tag: v10_alpha1~1179
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0d973c41b4568d5bad1295879e35cfa611bdcf2;p=platform%2Fupstream%2Flibav.git

vdpau: use the correct namespace for the union

Vdp is used by libvdpau, use AVVDPAU as used for the rest.

Reported-by: Alexis Ballier <aballier@gentoo.org>
---

diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 7e692f7..a589315 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -52,7 +52,7 @@
 #include <vdpau/vdpau.h>
 #include <vdpau/vdpau_x11.h>
 
-union VdpPictureInfo {
+union AVVDPAUPictureInfo {
     VdpPictureInfoH264        h264;
     VdpPictureInfoMPEG1Or2    mpeg;
     VdpPictureInfoVC1          vc1;
@@ -88,7 +88,7 @@ typedef struct AVVDPAUContext {
      *
      * Set by libavcodec.
      */
-    union VdpPictureInfo info;
+    union AVVDPAUPictureInfo info;
 
     /**
      * Allocated size of the bitstream_buffers table.
@@ -136,7 +136,7 @@ struct vdpau_render_state {
     int state; ///< Holds FF_VDPAU_STATE_* values.
 
     /** picture parameter information for all supported codecs */
-    union VdpPictureInfo info;
+    union AVVDPAUPictureInfo info;
 
     /** Describe size/location of the compressed video data.
         Set to 0 when freeing bitstream_buffers. */