From patchwork Fri May 4 22:57:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 8788 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp530033jad; Fri, 4 May 2018 16:04:34 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoXJHPYT50AqMl+mCLq/BPRPJeAM8Fie6R1SU0mdg7ObQmteyg4XVTxR4pwurtx1+oDPvI/ X-Received: by 2002:adf:c88e:: with SMTP id k14-v6mr21705858wrh.135.1525475074721; Fri, 04 May 2018 16:04:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525475074; cv=none; d=google.com; s=arc-20160816; b=hJV/u1qhzYflTan6QLZmaqTj83KthkRy2yUCj97MiPreQCVSP3YAqr5LXfl4CEEKa2 Sd3+wzjy6zCtAtvYmcGgaomOQwiSfRzsnT57WF2oXz2g3qSRUaezYsy+1PPJG0bvKAHZ saZzDqSCwum/L0vnGejp5t/lTKw0ZOLE8vN/Uw1HCu9vQywa/kdgSb3AheHkotuIe4nc TbBggITq+/ff4erK95rMWDmOQbcIngIwqUQjhl5Mnf5Z5EE1qIj99dmzusJixokNtDH9 POiQxZwiv61uMrLArYExFYZGFz2LjzOuNCcDmjT4zme1jyWTzb1Y5AZeFmr+W8LVsLWP Sd7Q== 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=JnN0IFKNlY+Geh9kd1uFRX4SM3VhBktad0KqyOBCPbc=; b=sNhMwZK38eOAU8woGVJgVun2wtoTReHNygpyc+2BEAAmnFSmAB7qvNhDX3TF9MnbS3 OP9risYIF41Alx2LzasrgYzjRWI/vOWk4QPvSt1mbuZG4vN0RWZOnFiDTYzm460Jsi5/ JYownSSMKzgyA6qDjdYIGFSEeSczaCaqlh+MbwNKfVAHCD9ckOMjUYgq15GX/jUYqtW4 8taJSMiebTavzmVctpK4/O+n8kwuDgOs/uk8k7g2XcnCAOUFU0RQLramdauF2M3iOuob 2lHvk/1abY4HMK0wLZ+vT9M0L3YeO92Huy/uEeUSnJV0TQC7wI0J1BL7goU854oo9q4x XrIw== 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=fUmkwaJD; 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 j91-v6si10105811wrj.140.2018.05.04.16.04.34; Fri, 04 May 2018 16:04:34 -0700 (PDT) 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=fUmkwaJD; 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 8B7E368A55B; Sat, 5 May 2018 02:03:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9265568A506 for ; Sat, 5 May 2018 02:03:52 +0300 (EEST) Received: by mail-pg0-f65.google.com with SMTP id l2-v6so16368213pgc.7 for ; Fri, 04 May 2018 16:04:26 -0700 (PDT) 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=tCR+l2RYMEc8Tarwq7hbpQPghnrZstorJN7FNAhp1oI=; b=fUmkwaJDwM7z5xHwH5Rb6sTHJ9S7GkLPNIBtj/LBLUFCE5Mt1AYehODSGyD7AdmMxM XjsL39yNth0wYZ7jW3blXLZx9HtMO+xiF+/UbgWc2GrBpyIKH5YHTnLEwVSQpIihMrAe Ezvghg+jKIKRia4pSnyH2AusKQBLHSv/cgqwUXFP5lsPqQdM9E6979wVlJtQoEg06EWR RR/k/Dj0zPn5FCr5HCd0z4sopdU8/8bdV/n8uLcCQ5VpU6vHJFVpGe0BOSpIxvcIMl0f CtzOFq2/euII2+wyc0ayaMV2xaV4gj3RspkkIYX/NDQZ39VWVZySVUHK/q+igCq/iNPg /rSA== 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=tCR+l2RYMEc8Tarwq7hbpQPghnrZstorJN7FNAhp1oI=; b=m519STRYA+B6myu4LzKRvd0YSLzAHThZQQ3CPmMH+hTZY+DCobQpm3AMSl0oq/jqe6 m8/ZWP3uJ2T2UDp7/qbFGznIo5xIeBj2+W9BWCKc0doIMoPn6Qnr6dwLEc2rnNDNU+Ks sdo+yVtRCExl1dxqixX6/PK9kTYVBYXlvJ3BXfhp3UeL43/09ONnWJI52cnL2vmqdeWZ OhAD2DoDW/bb8sg2a8yS5PtssiByt6VKjHSKrw9wRp4xYXjW+bMHUeHQHCjsDnXPzbtd 7pJCR1KV33136jAizQLYiJakGxxXS971q1Bv7xCA8S4kOTcS+hsnCs80JqkveqOYQhzv 0tDw== X-Gm-Message-State: ALQs6tDRIwCIJ8D+hegmAQ/MOTqGn4inwMzDxzl0Gq63Agq7Z9VG/ZrD K7lP/m0ZriKf43ne+Qk8vw5SH5rq X-Received: by 2002:a17:902:9a0c:: with SMTP id v12-v6mr28725536plp.162.1525474636508; Fri, 04 May 2018 15:57:16 -0700 (PDT) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id h1sm34521780pfg.135.2018.05.04.15.57.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 May 2018 15:57:15 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 May 2018 15:57:08 -0700 Message-Id: <20180504225711.69909-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/videotoolbox: cleanups 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 , kernrj@gmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta No functional changes. --- libavcodec/videotoolbox.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 57b6698e1b..1fd4be7135 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -340,7 +340,7 @@ int ff_videotoolbox_h264_start_frame(AVCodecContext *avctx, uint32_t size) { VTContext *vtctx = avctx->internal->hwaccel_priv_data; - H264Context *h = avctx->priv_data; + H264Context *h = avctx->priv_data; if (h->is_avc == 1) { return videotoolbox_buffer_copy(vtctx, buffer, size); @@ -935,9 +935,7 @@ static int videotoolbox_hevc_end_frame(AVCodecContext *avctx) HEVCContext *h = avctx->priv_data; AVFrame *frame = h->ref->frame; VTContext *vtctx = avctx->internal->hwaccel_priv_data; - int ret; - - ret = videotoolbox_common_end_frame(avctx, frame); + int ret = videotoolbox_common_end_frame(avctx, frame); vtctx->bitstream_size = 0; return ret; }