Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil.

[ffmpeg] / libavcodec / vdpau.h

diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 7933a791721e1e85d4e89922c8c6045c1345ac26..df2aaced2663cd99e6e4c2f229b17a7dd89c1133 100644 (file)
--- 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;
 };
 
 /* @}*/