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.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.h')
| -rw-r--r-- | libavcodec/vdpau.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 91948e707b..9d3128eb49 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -57,12 +57,14 @@ #define FF_API_CAP_VDPAU 1 #endif +#if FF_API_BUFS_VDPAU union AVVDPAUPictureInfo { VdpPictureInfoH264 h264; VdpPictureInfoMPEG1Or2 mpeg; VdpPictureInfoVC1 vc1; VdpPictureInfoMPEG4Part2 mpeg4; }; +#endif /** * This structure is used to share data between the libavcodec library and @@ -88,11 +90,13 @@ typedef struct AVVDPAUContext { */ VdpDecoderRender *render; +#if FF_API_BUFS_VDPAU /** * VDPAU picture information * * Set by libavcodec. */ + attribute_deprecated union AVVDPAUPictureInfo info; /** @@ -100,6 +104,7 @@ typedef struct AVVDPAUContext { * * Set by libavcodec. */ + attribute_deprecated int bitstream_buffers_allocated; /** @@ -107,6 +112,7 @@ typedef struct AVVDPAUContext { * * Set by libavcodec. */ + attribute_deprecated int bitstream_buffers_used; /** @@ -115,7 +121,9 @@ typedef struct AVVDPAUContext { * * Set by libavcodec. */ + attribute_deprecated VdpBitstreamBuffer *bitstream_buffers; +#endif } AVVDPAUContext; #if FF_API_CAP_VDPAU |