Module: libav Branch: master Commit: 18db1286b04557aa2d2df7efbcb65ae825d5a469
Author: Vittorio Giovara <[email protected]> Committer: Vittorio Giovara <[email protected]> Date: Tue Apr 7 01:47:18 2015 +0200 libxvid: Make codec use the init-cleanup flag and mark it as init-thread-safe This takes care of memory leaks on init error. --- libavcodec/libxvid.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 6486ad1..46da773 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -33,6 +33,7 @@ #include "libavutil/mathematics.h" #include "avcodec.h" +#include "internal.h" #include "libxvid.h" #include "mpegvideo.h" @@ -778,8 +779,12 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx) { struct xvid_context *x = avctx->priv_data; - xvid_encore(x->encoder_handle, XVID_ENC_DESTROY, NULL, NULL); + if (x->encoder_handle) { + xvid_encore(x->encoder_handle, XVID_ENC_DESTROY, NULL, NULL); + x->encoder_handle = NULL; + } + av_frame_free(&avctx->coded_frame); av_freep(&avctx->extradata); if (x->twopassbuffer) { av_free(x->twopassbuffer); @@ -824,4 +829,6 @@ AVCodec ff_libxvid_encoder = { .close = xvid_encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .priv_class = &xvid_class, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, }; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
