diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 18:31:45 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 18:31:45 +0300 |
commit | b9fd813351733b867fb73219e33b1f4845b40dde (patch) | |
tree | 5eabf60865b557c7616892fa6ce7c2676f97cb54 /libavcodec/utils.c | |
parent | f1b02e6ca88909f428d4a690c47620575853b647 (diff) | |
parent | 8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79 (diff) |
Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79'
* commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79':
lavu: Drop deprecated duplicated AVFrame/AVCodecContext parameters
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 18d86e3385..cfc561346f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1096,31 +1096,6 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) return ret; } -#if FF_API_AVFRAME_LAVC -void avcodec_get_frame_defaults(AVFrame *frame) -{ -#if LIBAVCODEC_VERSION_MAJOR >= 55 - // extended_data should explicitly be freed when needed, this code is unsafe currently - // also this is not compatible to the <55 ABI/API - if (frame->extended_data != frame->data && 0) - av_freep(&frame->extended_data); -#endif - - memset(frame, 0, sizeof(AVFrame)); - av_frame_unref(frame); -} - -AVFrame *avcodec_alloc_frame(void) -{ - return av_frame_alloc(); -} - -void avcodec_free_frame(AVFrame **frame) -{ - av_frame_free(frame); -} -#endif - MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor) MAKE_ACCESSORS(AVCodecContext, codec, int, lowres) |