summaryrefslogtreecommitdiff
path: root/libavcodec/vdpau_internal.h
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/vdpau_internal.h')
-rw-r--r--libavcodec/vdpau_internal.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index e1ea4306f2..e5fe63dd19 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -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.