[FFmpeg-devel] [PATCH] vdpau: Rename union, avoid name conflict with vdpau

[Michael Niedermayer]

Fixes Ticket2203

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavcodec/vdpau.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 7933a79..df2aace 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;
 };
 
 /* @}*/
-- 
1.7.9.5