diff options
| author | Rémi Denis-Courmont <remi@remlab.net> | 2014-12-19 19:15:05 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-12-25 20:47:49 +0100 |
| commit | 737d35e33408263c04d7730f5487eed0d04938ba (patch) | |
| tree | e66bdfc385f84d48536684635989bb344754486e /libavcodec/vdpau_internal.h | |
| parent | 1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec (diff) | |
vdpau: add support for the H.264 High 4:4:4 Predictive profile
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/vdpau_internal.h')
| -rw-r--r-- | libavcodec/vdpau_internal.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 16493b0741..9cc953887a 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -37,16 +37,15 @@ static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic) return (uintptr_t)pic->data[3]; } -#if !FF_API_BUFS_VDPAU -union AVVDPAUPictureInfo { +union VDPAUPictureInfo { VdpPictureInfoH264 h264; VdpPictureInfoMPEG1Or2 mpeg; VdpPictureInfoVC1 vc1; VdpPictureInfoMPEG4Part2 mpeg4; -}; -#else -#include "vdpau.h" +#ifdef VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE + VdpPictureInfoH264Predictive h264_predictive; #endif +}; typedef struct VDPAUHWContext { AVVDPAUContext context; @@ -85,7 +84,7 @@ struct vdpau_picture_context { /** * VDPAU picture information. */ - union AVVDPAUPictureInfo info; + union VDPAUPictureInfo info; /** * Allocated size of the bitstream_buffers table. |