summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2016-12-05 14:31:25 -0500
committerVittorio Giovara <vittorio.giovara@gmail.com>2017-03-23 10:09:13 +0100
commit5c1585c4c3b5281835d784c5daef0069915ccd57 (patch)
tree420e5fc25731a008395d41ede205cc8789052a1a
parent7b917041184874e7d7cba4450813de7e0bb28a33 (diff)
lavc: Drop deprecated VDPAU buffer fields
Deprecated in 07/2013.
-rw-r--r--libavcodec/vdpau.h44
-rw-r--r--libavcodec/version.h3
2 files changed, 0 insertions, 47 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 2f4fa86ba4..a5d31cb37b 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -56,15 +56,6 @@
#include "avcodec.h"
#include "version.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
* the client video application.
@@ -92,41 +83,6 @@ typedef struct AVVDPAUContext {
* Set by the user.
*/
VdpDecoderRender *render;
-
-#if FF_API_BUFS_VDPAU
- /**
- * VDPAU picture information
- *
- * Set by libavcodec.
- */
- attribute_deprecated
- union AVVDPAUPictureInfo info;
-
- /**
- * Allocated size of the bitstream_buffers table.
- *
- * Set by libavcodec.
- */
- attribute_deprecated
- int bitstream_buffers_allocated;
-
- /**
- * Useful bitstream buffers in the bitstream buffers table.
- *
- * Set by libavcodec.
- */
- attribute_deprecated
- int bitstream_buffers_used;
-
- /**
- * Table of bitstream buffers.
- * The user is responsible for freeing this buffer using av_freep().
- *
- * Set by libavcodec.
- */
- attribute_deprecated
- VdpBitstreamBuffer *bitstream_buffers;
-#endif
} AVVDPAUContext;
/**
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 3d7e47c729..033909a1e4 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
* the public API and may change, break or disappear at any time.
*/
-#ifndef FF_API_BUFS_VDPAU
-#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
#ifndef FF_API_VOXWARE
#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif