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

2022-02-11 Thread Andreas Rheinhardt 
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt 
> ---
>  libavcodec/g2meet.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
> index 4c53838af5..8628016ef4 100644
> --- a/libavcodec/g2meet.c
> +++ b/libavcodec/g2meet.c
> @@ -1592,7 +1592,6 @@ static av_cold int g2m_decode_init(AVCodecContext 
> *avctx)
>  
>  if ((ret = jpg_init(avctx, &c->jc)) != 0) {
>  av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n");
> -jpg_free_context(&c->jc);
>  return AVERROR(ENOMEM);
>  }
>  
> @@ -1633,5 +1632,5 @@ const AVCodec ff_g2m_decoder = {
>  .close  = g2m_decode_end,
>  .decode = g2m_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 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".

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

2022-02-08 Thread Andreas Rheinhardt 
Signed-off-by: Andreas Rheinhardt 
---
 libavcodec/g2meet.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 4c53838af5..8628016ef4 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -1592,7 +1592,6 @@ static av_cold int g2m_decode_init(AVCodecContext *avctx)
 
 if ((ret = jpg_init(avctx, &c->jc)) != 0) {
 av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n");
-jpg_free_context(&c->jc);
 return AVERROR(ENOMEM);
 }
 
@@ -1633,5 +1632,5 @@ const AVCodec ff_g2m_decoder = {
 .close  = g2m_decode_end,
 .decode = g2m_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".

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

2022-02-08 Thread Andreas Rheinhardt 
Signed-off-by: Andreas Rheinhardt 
---
 libavcodec/g2meet.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 4c53838af5..8628016ef4 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -1592,7 +1592,6 @@ static av_cold int g2m_decode_init(AVCodecContext *avctx)
 
 if ((ret = jpg_init(avctx, &c->jc)) != 0) {
 av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n");
-jpg_free_context(&c->jc);
 return AVERROR(ENOMEM);
 }
 
@@ -1633,5 +1632,5 @@ const AVCodec ff_g2m_decoder = {
 .close  = g2m_decode_end,
 .decode = g2m_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".