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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  5 20:17:42 2013 +0100| [68dfe530e0fb03b4d21dfe37f8a572b95c68485e] | committer: Michael Niedermayer

vdpau: Rename union, avoid name conflict with vdpau

Fixes Ticket2203

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68dfe530e0fb03b4d21dfe37f8a572b95c68485e
---

 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;
 };
 
 /* @}*/