From 68dfe530e0fb03b4d21dfe37f8a572b95c68485e Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 5 Feb 2013 20:17:42 +0100
Subject: [PATCH] vdpau: Rename union, avoid name conflict with vdpau
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes Ticket2203

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavcodec/vdpau.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 7933a79172..df2aaced26 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 FFVdpPictureInfo {
     VdpPictureInfoH264        h264;
     VdpPictureInfoMPEG1Or2    mpeg;
     VdpPictureInfoVC1          vc1;
@@ -88,7 +88,7 @@ typedef struct AVVDPAUContext {
      *
      * Set by libavcodec.
      */
-    union VdpPictureInfo info;
+    union FFVdpPictureInfo info;
 
     /**
      * Allocated size of the bitstream_buffers table.
@@ -143,7 +143,7 @@ struct vdpau_render_state {
     VdpBitstreamBuffer *bitstream_buffers;
 
     /** picture parameter information for all supported codecs */
-    union VdpPictureInfo info;
+    union FFVdpPictureInfo info;
 };
 
 /* @}*/