[FFmpeg-devel] [PATCH 3/3] avcodec/smacker: Add FF_CODEC_CAP_INIT_CLEANUP

Andreas Rheinhardt andreas.rheinhardt at gmail.com
Mon Jun 29 13:50:49 EEST 2020


Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> ---
>  libavcodec/smacker.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
> index b4c463b4b9..9f054f071d 100644
> --- a/libavcodec/smacker.c
> +++ b/libavcodec/smacker.c
> @@ -600,13 +600,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
>      /* decode huffman trees from extradata */
>      if(avctx->extradata_size < 16){
>          av_log(avctx, AV_LOG_ERROR, "Extradata missing!\n");
> -        decode_end(avctx);
>          return AVERROR(EINVAL);
>      }
>  
>      ret = decode_header_trees(c);
>      if (ret < 0) {
> -        decode_end(avctx);
>          return ret;
>      }
>  
> @@ -840,6 +838,7 @@ AVCodec ff_smacker_decoder = {
>      .close          = decode_end,
>      .decode         = decode_frame,
>      .capabilities   = AV_CODEC_CAP_DR1,
> +    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
>  };
>  
>  AVCodec ff_smackaud_decoder = {
> 
Will apply tomorrow unless there are objections.

- Andreas


More information about the ffmpeg-devel mailing list