Merge commit 'c0d973c4'

* commit 'c0d973c4':
  vdpau: use the correct namespace for the union

Conflicts:
	libavcodec/vdpau.h

See: 68dfe530Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/vdpau.h

@@ -53,7 +53,7 @@
 #include <vdpau/vdpau_x11.h>
 #include "libavutil/avconfig.h"
 
-union FFVdpPictureInfo {
+union AVVDPAUPictureInfo {
     VdpPictureInfoH264        h264;
     VdpPictureInfoMPEG1Or2    mpeg;
     VdpPictureInfoVC1          vc1;
@@ -89,7 +89,7 @@ typedef struct AVVDPAUContext {
      *
      * Set by libavcodec.
      */
-    union FFVdpPictureInfo info;
+    union AVVDPAUPictureInfo info;
 
     /**
      * Allocated size of the bitstream_buffers table.
@@ -138,7 +138,7 @@ struct vdpau_render_state {
 
 #if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
     /** picture parameter information for all supported codecs */
-    union FFVdpPictureInfo info;
+    union AVVDPAUPictureInfo info;
 #endif
 
     /** Describe size/location of the compressed video data.
@@ -150,7 +150,7 @@ struct vdpau_render_state {
 
 #if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
     /** picture parameter information for all supported codecs */
-    union FFVdpPictureInfo info;
+    union AVVDPAUPictureInfo info;
 #endif
 };