diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 13:37:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 14:46:15 +0100 |
| commit | 6f764d291121f4980b292cdaa537aa8fb10cb93b (patch) | |
| tree | d5b576132ba517872c2bad8e8423a96e3d0bef3b /libavcodec/vdpau_internal.h | |
| parent | a6ab9ed50d8a5b749f3e0a670e4fd6ee52d92b94 (diff) | |
| parent | 737d35e33408263c04d7730f5487eed0d04938ba (diff) | |
| download | ffmpeg-6f764d291121f4980b292cdaa537aa8fb10cb93b.tar.gz | |
Merge commit '737d35e33408263c04d7730f5487eed0d04938ba'
* commit '737d35e33408263c04d7730f5487eed0d04938ba':
vdpau: add support for the H.264 High 4:4:4 Predictive profile
Conflicts:
libavcodec/vdpau_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_internal.h')
| -rw-r--r-- | libavcodec/vdpau_internal.h | 11 |
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. |