diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:30:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:30:49 +0200 |
| commit | 9547e3eef36921f9937d7154048fd5eafe8d45fb (patch) | |
| tree | c827949a60acb27dcdc601f0e9d8fd6a449c6935 /libavcodec/vdpau_internal.h | |
| parent | c3b29023207850fa3b5b6b4dcb8e4940b86abb83 (diff) | |
| parent | f824535a4a79c260b59d3178b8d958217caffd78 (diff) | |
| download | ffmpeg-9547e3eef36921f9937d7154048fd5eafe8d45fb.tar.gz | |
Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'
* commit 'f824535a4a79c260b59d3178b8d958217caffd78':
vdpau: deprecate bitstream buffers within the hardware context
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_internal.h')
| -rw-r--r-- | libavcodec/vdpau_internal.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 4806a43300..001f17cf36 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -35,6 +35,15 @@ static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic) return (uintptr_t)pic->f.data[3]; } +#if !FF_API_BUFS_VDPAU +union AVVDPAUPictureInfo { + VdpPictureInfoH264 h264; + VdpPictureInfoMPEG1Or2 mpeg; + VdpPictureInfoVC1 vc1; + VdpPictureInfoMPEG4Part2 mpeg4; +}; +#endif + struct vdpau_picture_context { /** * VDPAU picture information. |