[FFmpeg-devel] [PATCH 2/2] avcodec/zerocodec: use init cleanup internal cap

Vittorio Giovara vittorio.giovara at gmail.com
Sat Apr 11 09:18:45 EEST 2020


On Thu, Apr 9, 2020 at 5:21 AM Paul B Mahol <onemda at gmail.com> wrote:

> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
>  libavcodec/zerocodec.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c
> index b0fab91004..1051fdaa45 100644
> --- a/libavcodec/zerocodec.c
> +++ b/libavcodec/zerocodec.c
> @@ -131,10 +131,8 @@ static av_cold int
> zerocodec_decode_init(AVCodecContext *avctx)
>      }
>
>      zc->previous_frame = av_frame_alloc();
> -    if (!zc->previous_frame) {
> -        zerocodec_decode_close(avctx);
> +    if (!zc->previous_frame)
>          return AVERROR(ENOMEM);
> -    }
>
>      return 0;
>  }
> @@ -157,5 +155,6 @@ AVCodec ff_zerocodec_decoder = {
>      .flush          = zerocodec_decode_flush,
>      .close          = zerocodec_decode_close,
>      .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.17.1
>

seems good to me, I'd keep the {} for clarity as minor nit
-- 
Vittorio


More information about the ffmpeg-devel mailing list