diff --git a/libavcodec/libwebpenc.c b/libavcodec/libwebpenc.c index 4c22a9b04a1339d68fae0bb70efde3e7ac733653..db96e1637b6ab37d6d935ff45b8116317911d39e 100644 --- a/libavcodec/libwebpenc.c +++ b/libavcodec/libwebpenc.c @@ -80,7 +80,10 @@ end: static int libwebp_encode_close(AVCodecContext *avctx) { - return ff_libwebp_encode_close_common(avctx); + LibWebPContextCommon *s = avctx->priv_data; + av_frame_free(&s->ref); + + return 0; } static const AVClass class = { diff --git a/libavcodec/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c index c1e2a1cb9a023f0546f9e3dfb733c9937ccbde9b..e9582016d388df8d7a364bec00681b612cba0711 100644 --- a/libavcodec/libwebpenc_animencoder.c +++ b/libavcodec/libwebpenc_animencoder.c @@ -116,12 +116,11 @@ end: static int libwebp_anim_encode_close(AVCodecContext *avctx) { - int ret = ff_libwebp_encode_close_common(avctx); - if (!ret) { - LibWebPAnimContext *s = avctx->priv_data; - WebPAnimEncoderDelete(s->enc); - } - return ret; + LibWebPAnimContext *s = avctx->priv_data; + av_frame_free(&s->cc.ref); + WebPAnimEncoderDelete(s->enc); + + return 0; } static const AVClass class = { diff --git a/libavcodec/libwebpenc_common.c b/libavcodec/libwebpenc_common.c index 373adca756e941933d14177b647d1b307a630166..a76b6da5d677b833082dc1ffe2d3284d82465480 100644 --- a/libavcodec/libwebpenc_common.c +++ b/libavcodec/libwebpenc_common.c @@ -252,10 +252,3 @@ int ff_libwebp_get_frame(AVCodecContext *avctx, LibWebPContextCommon *s, end: return ret; } - -int ff_libwebp_encode_close_common(AVCodecContext *avctx) -{ - LibWebPContextCommon *s = avctx->priv_data; - av_frame_free(&s->ref); - return 0; -} diff --git a/libavcodec/libwebpenc_common.h b/libavcodec/libwebpenc_common.h index 7e653dab2b33f901c42634c16e57c67e19b903b9..e74e57939e763c2ff8dbeed82465ac926a06de4d 100644 --- a/libavcodec/libwebpenc_common.h +++ b/libavcodec/libwebpenc_common.h @@ -57,8 +57,6 @@ int ff_libwebp_get_frame(AVCodecContext *avctx, LibWebPContextCommon *s, const AVFrame *frame, AVFrame **alt_frame_ptr, WebPPicture **pic_ptr); -int ff_libwebp_encode_close_common(AVCodecContext *avctx); - #define OFFSET(x) offsetof(LibWebPContextCommon, x) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = {