Merge commit '737d35e33408263c04d7730f5487eed0d04938ba'
[ffmpeg.git] / libavcodec / vdpau_internal.h
index e1ea4306f2a18ad20b70bf8494f375e91ac70096..e5fe63dd197c102eacd66f53f4e2ec2054ee89e7 100644 (file)
@@ -44,16 +44,17 @@ static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic)
 
 struct vdpau_picture_context;
 #if CONFIG_VDPAU
-#if !FF_API_BUFS_VDPAU
-union AVVDPAUPictureInfo {
+union VDPAUPictureInfo {
     VdpPictureInfoH264        h264;
     VdpPictureInfoMPEG1Or2    mpeg;
     VdpPictureInfoVC1          vc1;
     VdpPictureInfoMPEG4Part2 mpeg4;
+#ifdef VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE
+    VdpPictureInfoH264Predictive h264_predictive;
+#endif
 };
-#else
+
 #include "vdpau.h"
-#endif
 
 typedef struct VDPAUHWContext {
     AVVDPAUContext context;
@@ -92,7 +93,7 @@ struct vdpau_picture_context {
     /**
      * VDPAU picture information.
      */
-    union AVVDPAUPictureInfo info;
+    union VDPAUPictureInfo info;
 
     /**
      * Allocated size of the bitstream_buffers table.