diff mbox series

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

Message ID AM7PR03MB6660E5A08A54E6088C29D1548F2D9@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 21c41237d2d36971e3b483c3b737ea4ed2b4914f
Headers show
Series [FFmpeg-devel] avcodec/4xm: Cleanup generically on init failure | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Feb. 8, 2022, 12:17 p.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/4xm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Andreas Rheinhardt Feb. 11, 2022, 9:29 a.m. UTC | #1 
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  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
diff mbox series

Patch

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,
 };