summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libavcodec/libwebpenc.c5
-rw-r--r--libavcodec/libwebpenc_animencoder.c11
-rw-r--r--libavcodec/libwebpenc_common.c7
-rw-r--r--libavcodec/libwebpenc_common.h2
4 files changed, 9 insertions, 16 deletions
diff --git a/libavcodec/libwebpenc.c b/libavcodec/libwebpenc.c
index 4c22a9b..db96e16 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 c1e2a1c..e958201 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 373adca..a76b6da 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 7e653da..e74e579 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[] = {
OpenPOWER on IntegriCloud