diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:59:23 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:59:23 +0200 |
| commit | 4eb86b83a407faef20e9b243f341daa4e88728ef (patch) | |
| tree | 5f293a944dc2855180d74824fa1b485be26944e8 /libavcodec/vda_h264_dec.c | |
| parent | 83a5df54eae6dddea7c453fd25c45c7b9c148925 (diff) | |
| parent | 9f90b24877016e7140b9b14e4b1acee663bb6d8a (diff) | |
| download | ffmpeg-4eb86b83a407faef20e9b243f341daa4e88728ef.tar.gz | |
Merge commit '9f90b24877016e7140b9b14e4b1acee663bb6d8a'
* commit '9f90b24877016e7140b9b14e4b1acee663bb6d8a':
lavc: Drop deprecated get_buffer related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/vda_h264_dec.c')
| -rw-r--r-- | libavcodec/vda_h264_dec.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/vda_h264_dec.c b/libavcodec/vda_h264_dec.c index 6935e18684..a092693dbc 100644 --- a/libavcodec/vda_h264_dec.c +++ b/libavcodec/vda_h264_dec.c @@ -62,9 +62,6 @@ typedef struct { void *hwaccel_context; enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt); int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags); -#if FF_API_GET_BUFFER - int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic); -#endif } VDADecoderContext; static enum AVPixelFormat get_format(struct AVCodecContext *avctx, @@ -108,10 +105,6 @@ static inline void set_context(AVCodecContext *avctx) avctx->get_format = get_format; ctx->get_buffer2 = avctx->get_buffer2; avctx->get_buffer2 = get_buffer2; -#if FF_API_GET_BUFFER - ctx->get_buffer = avctx->get_buffer; - avctx->get_buffer = NULL; -#endif } static inline void restore_context(AVCodecContext *avctx) @@ -120,9 +113,6 @@ static inline void restore_context(AVCodecContext *avctx) avctx->hwaccel_context = ctx->hwaccel_context; avctx->get_format = ctx->get_format; avctx->get_buffer2 = ctx->get_buffer2; -#if FF_API_GET_BUFFER - avctx->get_buffer = ctx->get_buffer; -#endif } static int vdadec_decode(AVCodecContext *avctx, |