summaryrefslogtreecommitdiff
path: root/libavcodec/vdpau.h
diff options
context:
space:
mode:
authorRĂ©mi Denis-Courmont <remi@remlab.net>2013-07-25 22:30:21 +0300
committerAnton Khirnov <anton@khirnov.net>2013-08-05 11:21:36 +0200
commitf824535a4a79c260b59d3178b8d958217caffd78 (patch)
tree4a9f5e5094544cc013447b1a2fda78150be82585 /libavcodec/vdpau.h
parent2852740e23f91d6775714d7cc29b9a73e1111ce0 (diff)
vdpau: deprecate bitstream buffers within the hardware context
The bitstream buffers are now private and freed by libavcodec. For backward compatibility, the hold bitstream buffer pointer is left NULL (applications were supposed to av_freep() it). Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/vdpau.h')
-rw-r--r--libavcodec/vdpau.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 18efcaa6e5..8bedea54ba 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -52,12 +52,14 @@
#include <vdpau/vdpau.h>
#include <vdpau/vdpau_x11.h>
+#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
@@ -83,11 +85,13 @@ typedef struct AVVDPAUContext {
*/
VdpDecoderRender *render;
+#if FF_API_BUFS_VDPAU
/**
* VDPAU picture information
*
* Set by libavcodec.
*/
+ attribute_deprecated
union AVVDPAUPictureInfo info;
/**
@@ -95,6 +99,7 @@ typedef struct AVVDPAUContext {
*
* Set by libavcodec.
*/
+ attribute_deprecated
int bitstream_buffers_allocated;
/**
@@ -102,6 +107,7 @@ typedef struct AVVDPAUContext {
*
* Set by libavcodec.
*/
+ attribute_deprecated
int bitstream_buffers_used;
/**
@@ -110,7 +116,9 @@ typedef struct AVVDPAUContext {
*
* Set by libavcodec.
*/
+ attribute_deprecated
VdpBitstreamBuffer *bitstream_buffers;
+#endif
} AVVDPAUContext;
#if FF_API_CAP_VDPAU