Commit 5c1585c4 authored by Vittorio Giovara's avatar Vittorio Giovara

lavc: Drop deprecated VDPAU buffer fields

Deprecated in 07/2013.
parent 7b917041
...@@ -56,15 +56,6 @@ ...@@ -56,15 +56,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "version.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 * This structure is used to share data between the libavcodec library and
* the client video application. * the client video application.
...@@ -92,41 +83,6 @@ typedef struct AVVDPAUContext { ...@@ -92,41 +83,6 @@ typedef struct AVVDPAUContext {
* Set by the user. * Set by the user.
*/ */
VdpDecoderRender *render; 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; } AVVDPAUContext;
/** /**
......
...@@ -47,9 +47,6 @@ ...@@ -47,9 +47,6 @@
* the public API and may change, break or disappear at any time. * 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 #ifndef FF_API_VOXWARE
#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 58) #define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment