From patchwork Fri Jun 26 20:28:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20634 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CC34644BDDE for ; Fri, 26 Jun 2020 23:35:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8E5E68B0F4; Fri, 26 Jun 2020 23:35:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFC2E68AF66 for ; Fri, 26 Jun 2020 23:35:22 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id j18so9932453wmi.3 for ; Fri, 26 Jun 2020 13:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JqVPCVMXrb4d0g11ZuGYM7UTsqAjnsRh5yaGBhXAKm8=; b=qyYXD1LDy9B0icfq0GaQ5OJXT3/DGsRMPu9fc3un60EMdYUL75yrYhZJlVM9QIZncA VANd1AIvHPj6oCfWvSWGGNyLN3AEeJiT0Dy8Ydna6kDtfDJ8g7lCHNR8XE54vbYaghO9 g4Wu4lD5krKA0rfr43CnCQQhI4bJEFGCobq+T0LdJ9Cwv5kFlvGrGmZ5VAuA7cyuydkn rifFn3DhuBzRUFM5Q6ketcG0bU1NWs/vLT7eIanNeQgsWQLCkXY1U/hkA4wv3mOIvMOj 4UVuC6ymivXYitaYgUs6CayUf4UwH7w5YuWwbb0ybpKvW22NxIPlcvML3P+C6yhEuZ40 eSHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JqVPCVMXrb4d0g11ZuGYM7UTsqAjnsRh5yaGBhXAKm8=; b=FegBu/VvUXGPzCEFHI88E4GNSw2+uJSI1a873gEz522LKC95PoiGKFhW3frlTwmLT/ sSJUNriuO3dfdbtopaR9IQ9MqIgRiedk9hsoIP4kp8PIpAnNhqxz8Er8gVpCZfuf0rx7 BoNRtJWAlV4l3mKsnwizP7YsmevlB6xfw6xvWncRyNn60a+2wUwJtlLbmzoGAt/26czw yR03uJxI/xtl2Oqx/uVk2DsHvhxgclxCp6YYqz+R9D/IA3ncoJc0CGXuVejUiUWml8LA JCg5J6+iqlp3FeMFFf3hwYDE1Pt0oWI5mAbvwFfE+FtwyuBd+Tum81lDZYU1kmDIvhPA Uo6Q== X-Gm-Message-State: AOAM531RS+j2CW4OZKotupsDwUKwam2/Dxaqoag6wtI1vRzYFpbDf4IC ZXgHRBFUS82tJ6A5NcvOFAm+9k/9 X-Google-Smtp-Source: ABdhPJxSRzqcblZ/Bm8du6iGnc4av5SS2c1jAxHtxJFoMrWHdGiJm0lUQSfOD9r1QOjlh0WCsz2ahw== X-Received: by 2002:a7b:c09a:: with SMTP id r26mr5142867wmh.176.1593203329267; Fri, 26 Jun 2020 13:28:49 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id u8sm3519293wrt.28.2020.06.26.13.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 13:28:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Jun 2020 22:28:22 +0200 Message-Id: <20200626202822.17751-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626202822.17751-1-andreas.rheinhardt@gmail.com> References: <20200626202822.17751-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/smacker: Add FF_CODEC_CAP_INIT_CLEANUP X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- 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 = {