From patchwork Fri Nov 10 21:40:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5961 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3883626jah; Fri, 10 Nov 2017 13:41:13 -0800 (PST) X-Google-Smtp-Source: AGs4zMZKzwHolnWUMxpUwHDugxwnCB2EP5mbtwU1a2oDpw2YTJh231kXOulbosMdMcRMK9X1cB9Z X-Received: by 10.223.171.22 with SMTP id q22mr1515265wrc.62.1510350073753; Fri, 10 Nov 2017 13:41:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510350073; cv=none; d=google.com; s=arc-20160816; b=Iqn8GVUJiL+On0YogHS1AMaOfRAcVXvBqK8OLR7dxXgdc6msit+wpMT0rsFHq4nc1u a4Tp3jzDoqZC5kRi8bPo4w0Io+0VuE4uvU5Dn00+FhFQDtVcnbChI+Xnl54OrtjKXq2a SKuH67aliSPuN8BrRzipL9Onth+457Jp0bCIczS5fk6CcL7tjkixavAnxaAesGqEtTYU Q8HVDUBVbdHasLvaPf552ywpD3dZnxTOP7dnjjwy8vdX3CRcX/Fn7zS9zoU22yMDcBvl 9dQ2jT/LLUTA/macMLAPVHafzFk2trZJ0dEJ6h1YRa6+ZBhnurACIcxvKqICekghndrj O2Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=hSYTEfKU/WrTtoYxjxbQmAAMdWTVMW3JBfbSjNSibWE=; b=tIXYAbLHebFrn7+eefGYqbJKYZy7VHLfawre+RgKQa4GLD1hDO2mJk5Y8i82n6BlaT 8MtxIe7SGmc3aGJWjcRK3UDYX5TgMgyxohVuIaM+hjTQzubG5AqyWclMM+6OTbGfIp0Q r3xhhpgcoI09dez0UBZ6yfitZaUl5V7qepXQL8X7nA5MSQEnmjEI4z0UC9sYMEeD17q0 VebExENsdALX5rquGWtGnWNLYSqtYmJT+uoJt3Xj5QXS0Sn11rejpuU1R0qj23gOjQDK hxCqF1lOx3j1+CIif0hm4BOhiLepeHGPGywUclwvOodA3AMd1/TSTPQGauz0gUQ1eDhw UOtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=rjDk9zYS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z10si2056961wmh.243.2017.11.10.13.41.13; Fri, 10 Nov 2017 13:41:13 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=rjDk9zYS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C82F688290; Fri, 10 Nov 2017 23:40:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E87068042A for ; Fri, 10 Nov 2017 23:40:51 +0200 (EET) Received: by mail-pf0-f196.google.com with SMTP id n89so7540395pfk.11 for ; Fri, 10 Nov 2017 13:41:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=vmN6mQ50asurdjCW3lW4ewBLVs5RbC0Zb5JIR1eeLI8=; b=rjDk9zYSjQHnE+dYHIZXANYWnzclV8hdCylG2YvjDIsiz5glGURXsj3s71Gy3pNBIv v/jdhBBrS9uA0+p1UPcoNE5kqm8sp2RuHDl35DRqBCoIdqMb9YeMvi2i8qIJBd1C6bBK suXF14VvR5NsoMQ3naxXZIQn15mgZtKQ09Ci7nCF9niotDAsIXKHfdiaoCJ+GWOX5luw MzEPdaKigdRpsjnLaYJHJyErYNLrD3diR2syzUWALVYiFzkt3EQD+qH2ScDPLrwlD7t9 EaVB7GwtGFYZFsDom7uzHk8k5fGhYsjpzu9daNU2IwMbGfEwZv9B1gih5MD3xeOH4G4H 1WHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=vmN6mQ50asurdjCW3lW4ewBLVs5RbC0Zb5JIR1eeLI8=; b=D1rymzhkp+hqs8Wif5lUjmhj3jvA/uMRcjkGx0qjFC/Rhrow5rndZgKj2qJXxIAiXJ oPqrkPqGhEg9iui+rCcmFhnLzg2L5Rrs2U32W5DOGxTsByE/gTBkQUr3/wBeAfmep4BW jszMXV+20GM1chYw8MaU3NXayJpZSksP2gbbPlcZMhWYFwEReixBGWQcn+19UejoQPbf stftELVmp+BpOBzvBCIFj7Mal9HpCp4opCq+mf4M4q2nJsH1AaWmrFoCOkWVzUbeEZuH Y5Nuq6syf57bmEyze72re85rls/VXCgid6No3MINYEoD8z4utkX+BsErEVLNYQ6lDhja gzVg== X-Gm-Message-State: AJaThX6n+PAQUP/CnzCvh/PqT9qX+1iID9a/VQaddMCb4Z//9fKqYdZ7 ld+tQQ9vJwT4KoVZiEKBTgwMR/n1 X-Received: by 10.99.96.71 with SMTP id u68mr1581290pgb.389.1510350063308; Fri, 10 Nov 2017 13:41:03 -0800 (PST) Received: from tmm1-imac.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id 81sm20734554pfh.145.2017.11.10.13.41.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Nov 2017 13:41:02 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Nov 2017 13:40:46 -0800 Message-Id: <20171110214059.84891-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH v4 01/14] avcodec/videotoolbox: use early return in videotoolbox_default_free 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: nfxjfg@googlemail.com, Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Cosmetic change only. --- libavcodec/videotoolbox.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index ecb2502c1f..f5a282f72c 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -849,15 +849,15 @@ static int videotoolbox_default_init(AVCodecContext *avctx) static void videotoolbox_default_free(AVCodecContext *avctx) { AVVideotoolboxContext *videotoolbox = videotoolbox_get_context(avctx); + if (!videotoolbox) + return; - if (videotoolbox) { - if (videotoolbox->cm_fmt_desc) - CFRelease(videotoolbox->cm_fmt_desc); + if (videotoolbox->cm_fmt_desc) + CFRelease(videotoolbox->cm_fmt_desc); - if (videotoolbox->session) { - VTDecompressionSessionInvalidate(videotoolbox->session); - CFRelease(videotoolbox->session); - } + if (videotoolbox->session) { + VTDecompressionSessionInvalidate(videotoolbox->session); + CFRelease(videotoolbox->session); } }