From patchwork Mon Sep 14 05:27:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22349 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 EB0D544A49B for ; Mon, 14 Sep 2020 08:28:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D1C2368BB38; Mon, 14 Sep 2020 08:28:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 802BC68B86B for ; Mon, 14 Sep 2020 08:28:31 +0300 (EEST) Received: by mail-ed1-f53.google.com with SMTP id l17so16218569edq.12 for ; Sun, 13 Sep 2020 22:28:31 -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=mMRElwryGgfGut3MHcGtEYxHzkgKCod+vrmXT76f1t4=; b=sj5G1z1smJRvEgzUGguMgk3FB0bUSXXMtDucHPHM7LFk9mVDpSClABMCszM0/vWNMv 2/oiurF9GkpEJg4RzeRCb34N0ZZObFLIwX9g8PHGl0rKmXdvGPQbo0TlAKdHtIeLgdpw mAJULN1lV4m8zeFBJZCtiKrcBRKsqlNR4tnFMK1VP5z7E1/nvslO8svii/3fvo7+lM1G 420F1CnDxNucRUmndb+LN5OCRtlkac5KDximwcWw16XsOctkuO0d1dJJX6muCqQIBEkw tvoGPzq6XSv/elN3U426MQJtjxzdiT3gVFVgKYzpNza7uIDPWTrzYDOhaN7K3tnf5pat eFnw== 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=mMRElwryGgfGut3MHcGtEYxHzkgKCod+vrmXT76f1t4=; b=Z+c6ekBNN/vs2BFhcHHwY3BLubozgVoiC1+gI1u1ME1w0Wz7GgkKZZlecRxG6uyBLn x/GpFYk6TCyZVoCtrMRq05svDCDoeMSy4MZfHLnW4TZvlnsER6SmKKrY3JobGryn1I+W xMREJdVOvaEJJbAlS8YnPCVtn+ftZYTKPGV59rTrh1z08Z6Ir3KwARYUaeCkl9XCVVRn eeNG7E/0ZiHJk46ehawTwj1pnfOJjjY63dblN/Scrr2v6nvxLs8PtLJO8V/MlZWYw3Yr WxzvDJlZPevD+WYHZkJsOiCamW4XPIEmve4X7zZO6N0poKJJibDzx8avJ2iHKMZbezU0 G03A== X-Gm-Message-State: AOAM532kyTtduKkBbKnjFqVSnpk7lv65FgPwHDrIpjlLYn/4Ktj+fKnU hA0YwvyKx6QpUN+Xevw5uzIIgSxf1QE= X-Google-Smtp-Source: ABdhPJxLf8p07XV3g708RNWcIdowqlwwHwykI2u8J69+iWcYhXKABZopFoD0w3sj5aRjpJgjooRKoQ== X-Received: by 2002:a50:c182:: with SMTP id m2mr15108382edf.70.1600061310479; Sun, 13 Sep 2020 22:28:30 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f4sm8251421edm.76.2020.09.13.22.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2020 22:28:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Sep 2020 07:27:39 +0200 Message-Id: <20200914052747.124118-16-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> References: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 32/40] avcodec/dsicinvideo: Remove redundant code for freeing 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" The dsicinvideo decoder already has the FF_CODEC_CAP_INIT_CLEANUP flag set, so it is unnecessary to directly clean up some already allocated buffers in case another one could not be allocated in the init function, as all buffers will be freed anyway later in the decoder's close function. Signed-off-by: Andreas Rheinhardt --- libavcodec/dsicinvideo.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/dsicinvideo.c b/libavcodec/dsicinvideo.c index 7f74808e6d..52f660fb51 100644 --- a/libavcodec/dsicinvideo.c +++ b/libavcodec/dsicinvideo.c @@ -58,7 +58,6 @@ static av_cold int allocate_buffers(CinVideoContext *cin) cin->bitmap_table[i] = av_mallocz(cin->bitmap_size); if (!cin->bitmap_table[i]) { av_log(cin->avctx, AV_LOG_ERROR, "Can't allocate bitmap buffers.\n"); - destroy_buffers(cin); return AVERROR(ENOMEM); } }