mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 20:19:55 +00:00
libxvid: Make codec use the init-cleanup flag and mark it as init-thread-safe
This takes care of memory leaks on init error.
This commit is contained in:
parent
eae7338e15
commit
18db1286b0
@ -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,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user