generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libwebp: simplify AVCodec.close functions

Browse Source 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2015-05-23 14:24:34 -03:00
parent 57d9788d1b
commit 8952254ffe
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/libwebpenc.c
View File

@ -80,7 +80,10 @@ end:
static int libwebp_encode_close(AVCodecContext *avctx) 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 = { static const AVClass class = {

11
libavcodec/libwebpenc_animencoder.c
View File

@ -116,12 +116,11 @@ end:
static int libwebp_anim_encode_close(AVCodecContext *avctx) static int libwebp_anim_encode_close(AVCodecContext *avctx)
{ {
int ret = ff_libwebp_encode_close_common(avctx); LibWebPAnimContext *s = avctx->priv_data;
if (!ret) { av_frame_free(&s->cc.ref);
LibWebPAnimContext *s = avctx->priv_data; WebPAnimEncoderDelete(s->enc);
WebPAnimEncoderDelete(s->enc);
} return 0;
return ret;
} }
static const AVClass class = { static const AVClass class = {

7
libavcodec/libwebpenc_common.c
View File

@ -252,10 +252,3 @@ int ff_libwebp_get_frame(AVCodecContext *avctx, LibWebPContextCommon *s,
end: end:
return ret; return ret;
} }
int ff_libwebp_encode_close_common(AVCodecContext *avctx)
{
LibWebPContextCommon *s = avctx->priv_data;
av_frame_free(&s->ref);
return 0;
}

2
libavcodec/libwebpenc_common.h
View File

@ -57,8 +57,6 @@ int ff_libwebp_get_frame(AVCodecContext *avctx, LibWebPContextCommon *s,
const AVFrame *frame, AVFrame **alt_frame_ptr, const AVFrame *frame, AVFrame **alt_frame_ptr,
WebPPicture **pic_ptr); WebPPicture **pic_ptr);
int ff_libwebp_encode_close_common(AVCodecContext *avctx);
#define OFFSET(x) offsetof(LibWebPContextCommon, x) #define OFFSET(x) offsetof(LibWebPContextCommon, x)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {