[FFmpeg-devel] [PATCH] avcodec/4xm: Cleanup generically on init failure

2022-02-08 Thread Andreas Rheinhardt 
Signed-off-by: Andreas Rheinhardt 
---
 libavcodec/4xm.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index cb315cd7e4..cb361772d2 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -1008,10 +1008,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
 
 f->frame_buffer  = av_mallocz(avctx->width * avctx->height * 2);
 f->last_frame_buffer = av_mallocz(avctx->width * avctx->height * 2);
-if (!f->frame_buffer || !f->last_frame_buffer) {
-decode_end(avctx);
+if (!f->frame_buffer || !f->last_frame_buffer)
 return AVERROR(ENOMEM);
-}
 
 f->version = AV_RL32(avctx->extradata) >> 16;
 ff_blockdsp_init(&f->bdsp, avctx);
@@ -1038,5 +1036,5 @@ const AVCodec ff_fourxm_decoder = {
 .close  = decode_end,
 .decode = decode_frame,
 .capabilities   = AV_CODEC_CAP_DR1,
-.caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
+.caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
 };
-- 
2.32.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/4xm: Cleanup generically on init failure

2022-02-11 Thread Andreas Rheinhardt 
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt 
> ---
>  libavcodec/4xm.c | 6 ++
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
> index cb315cd7e4..cb361772d2 100644
> --- a/libavcodec/4xm.c
> +++ b/libavcodec/4xm.c
> @@ -1008,10 +1008,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
>  
>  f->frame_buffer  = av_mallocz(avctx->width * avctx->height * 2);
>  f->last_frame_buffer = av_mallocz(avctx->width * avctx->height * 2);
> -if (!f->frame_buffer || !f->last_frame_buffer) {
> -decode_end(avctx);
> +if (!f->frame_buffer || !f->last_frame_buffer)
>  return AVERROR(ENOMEM);
> -}
>  
>  f->version = AV_RL32(avctx->extradata) >> 16;
>  ff_blockdsp_init(&f->bdsp, avctx);
> @@ -1038,5 +1036,5 @@ const AVCodec ff_fourxm_decoder = {
>  .close  = decode_end,
>  .decode = decode_frame,
>  .capabilities   = AV_CODEC_CAP_DR1,
> -.caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
> +.caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE | 
> FF_CODEC_CAP_INIT_CLEANUP,
>  };

Will apply this patchset later tonight unless there are objections.

- Andreas
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".