From patchwork Sat Aug 29 17:56:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21992 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 CCA0444AD75 for ; Sat, 29 Aug 2020 20:57:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1B5B68ABFD; Sat, 29 Aug 2020 20:57:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 438D968A543 for ; Sat, 29 Aug 2020 20:57:08 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id h15so2069700wrt.12 for ; Sat, 29 Aug 2020 10:57:08 -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=OBnpL8DuizS8S5/NUar4E7FYc+WWOHkkK6JVwb53ao4=; b=VToEAPvD+sblP1R02jmyqRxjM3ZUBpc+PR/BLFn29rxruj3AnOlY9wRkVRrTZbXer/ s63CgXd2qZiQIZZ5CxglC5DZLH7ZrdhAKgQ2TFNLbcGHBjXFre3oOw+WPkH3/4AUyCDD /dEdCZI6mjK5s8+A0whk1iRZ5QMn4rNHx0L2ApaHiSb3KHQnU6kyrkLmlnN+Emd9WTLY wZEVoTooSI7LNky4X9ZJvszdUI2jEY4NSbVVFGVMT59B6Q4KbZs9Bp82hp7MFoWBMEpT SHg11++bNz5xCzxSrsAIP/mWy69voW+ZYpmPdTF9UsK4zRf+T2z87ERFJWgCcP1w8EwZ Owsg== 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=OBnpL8DuizS8S5/NUar4E7FYc+WWOHkkK6JVwb53ao4=; b=fNfdjTuNSWsW8pmfeMLvZ+l2ZGMhjUFsd69HtXcOWkSt77o+0kmRYWk9eX65JQnzqQ JfGDEe6FYuxp4A1ftk14/1O0EcLhz/8hmXRDbS/0gyCGOGBxqSRsnG3KgmTPiBZjmB+D Qn1s00uFTsmq6NbkZ/4SVp1qCJNW1d5/aVz7RNrJ4rIt2TRCnn63gqkjJs61WSpCWAc/ gXOUFkCqKP0sbpfxIgCPzjyP1UXu1cqOtuUXGDoXXY3ZIZbSy7pdnYGK+nDcZlp6KnAQ GD+7cgQg6N32ifR3RG9spSks+6/UUZFjZAH4p8ydE7cdtoRrLy0dzteg6qV3zFVme1oX V18Q== X-Gm-Message-State: AOAM532YKdRtGt3ax8lqE4tvBR4he6cCw9UdoQ1dyjlHpumbKU9B0rbc fI1rP8KuMSMFAMFstmZjlYX5UW3MRds= X-Google-Smtp-Source: ABdhPJyJr6BAbAiqmC3hBrDvl+kZirfbisoRjNLXFr20A8OmEQBB2khsxyhby+QtMOGFx5NxeY8Dlw== X-Received: by 2002:adf:f011:: with SMTP id j17mr4159906wro.335.1598723827554; Sat, 29 Aug 2020 10:57:07 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z8sm4016734wmf.10.2020.08.29.10.57.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2020 10:57:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 29 Aug 2020 19:56:19 +0200 Message-Id: <20200829175626.11682-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200829175626.11682-1-andreas.rheinhardt@gmail.com> References: <20200829175626.11682-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/13] avcodec/roqvideodec: Cleanup generically after init failure 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/roqvideodec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index a0c293f2f0..dd045ed5eb 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -184,11 +184,8 @@ static av_cold int roq_decode_init(AVCodecContext *avctx) s->last_frame = av_frame_alloc(); s->current_frame = av_frame_alloc(); - if (!s->current_frame || !s->last_frame) { - av_frame_free(&s->current_frame); - av_frame_free(&s->last_frame); + if (!s->current_frame || !s->last_frame) return AVERROR(ENOMEM); - } avctx->pix_fmt = AV_PIX_FMT_YUVJ444P; avctx->color_range = AVCOL_RANGE_JPEG; @@ -248,4 +245,5 @@ AVCodec ff_roq_decoder = { .close = roq_decode_end, .decode = roq_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };