From patchwork Thu Jun 21 11:45:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9460 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1908152jad; Thu, 21 Jun 2018 04:46:26 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLu6m906v435leJv210XKBAlig2k0Rl9aXgkJfXrTAHGinknZxfAD42UlfhUQ44o8nhvipS X-Received: by 2002:adf:ec89:: with SMTP id z9-v6mr2131444wrn.160.1529581586046; Thu, 21 Jun 2018 04:46:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529581586; cv=none; d=google.com; s=arc-20160816; b=nolZFEKRjlRE6bZUATwzBhpXQBu6p6wUSBfSC+NutlgTwyZQf3zd9PXzXQABhZEQ1I 7bygFrMxpUqsAqwUGynD9Ej5JM1tqlQ/2tnDMdksyh7wFsMymzxf4WrgSEm23gsuIrof 0qJ8TwKXLsaD4KJZzz2CXyMgHy9EXvROGW5a4DaAzBV7epb9tpjsVx/1nDP65l0xU/Iv u1rDKmSAtQk/pqJOB0u2PzQNPmDi4ZmcfV5Z1WJEmOLUsP4hINWty7C4YZ8mxM0F3/Gn BJ9vSh4Jl7W+518M+lFUqq2Tae/tqleG55Tn9bYdkizw5dexiasyXiVRmB6hQJ42/DZ9 xCjg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=btt2D1qdjdiM0Q9oJ8udJgggSVwwFCG9XbnKH585kCo=; b=AJ0awjUDBLmKJgJdz7p5/5dlgvxdQE0/hQ7ieyNZQ3SZxexBWWAv2PsMulGuqw+8LK 4qOHposGxrpAcrWWEJfslSQhWbyl0tPBgj7Dfg0X+7MuCl7rEdoQexKoORYZGjfNqQRp K2AYVEsGa3JBqtDQ81tCkBwJjjeByJUm/1Uri3pmOF5bwvuXXLPP8cvtdxr7b2w2XZ60 Hj1dORrXxkqH9YAIZoeAJDff3jvUjzGRiQ0QBmeU25TU8Y6tRwtwK+mOW+92NtToDrOL mQIPCaIq23QC1B8yP0GNmdntpjGxDor/cK6QN1MakZaEMfCMBnMJmNee5giZ/BXXmVRY /qpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="PP/SuNLO"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n16-v6si1061604wmh.2.2018.06.21.04.46.25; Thu, 21 Jun 2018 04:46:25 -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=@gmail.com header.s=20161025 header.b="PP/SuNLO"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B58368A6F6; Thu, 21 Jun 2018 14:45:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f174.google.com (mail-pf0-f174.google.com [209.85.192.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4499D68A6EA for ; Thu, 21 Jun 2018 14:45:10 +0300 (EEST) Received: by mail-pf0-f174.google.com with SMTP id h12-v6so1414850pfk.11 for ; Thu, 21 Jun 2018 04:46:04 -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; bh=LDzSd9YOkNcpWya5apL1O3foiP/j1KjyEjTgfQm0l6A=; b=PP/SuNLOF8SADDTTgb/YoiIXx0XVeXUNo1Fo6lGDj4L/WkZfFlTY2wdh/suKjmBe2o ZgvfLsXfsFnAk53SwgoMN3XcAhfqRTylnfldw2hr84u+/ovZvri5GGgZswPxDkC4dz1i t3J9J/9XLZ/v+qzGJvCUlGMPkIzZ0HVkmVMxzOxJKGvCMVrmyzVh8Mz5mk3e9k28cltI sfgz40pE2Dp0nm4iwObZGE88evkxV8qbTynye3iOvMJl2E+AvHpVAOPS91lKAn68yCJ2 bVB+3OkH0dS1PIohyBGYGMgbHTz+3WZLrWXaaRk6m7dUHoVk0CLU/lC7+tWd9zjTVWDR lNng== 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; bh=LDzSd9YOkNcpWya5apL1O3foiP/j1KjyEjTgfQm0l6A=; b=iNsDPojk6jZzPfwTBvusTb8uMKdDAPun5cKsadEpS5uxzzoy5ST0yuiX7ipbSq0WNQ xP78ruFVS1m7ZC3orReWsv+Dtd7xDcb4rwBVRG65onREg3xxnX0yrzy1Y4h11O3ij0OS V48icD/UPJNnwESFOwOliwisjf1f9qNeCnnhrrxCqQiHKuAm2bXJSuZMejzcdQVVmYzl N/qPLTAhwQKzdBl3MAIVEmQQQdlwBZd6wwfslI6vFz0mZg1UbW6Xw/wbqj7qqzeinBLL 71y0KbF/gAqLjq/u1oPuA/vQJK1r2reT2jLhvhtStyiVey8yEFpXm/AM887Pflired8g JpOA== X-Gm-Message-State: APt69E1qY+cTKsF39eYYH8kiE5Q2grMEtAVqRKqETFykUWzltJPaDrlz /uBK7kKAjGD+8bIVSR7qUCuJww== X-Received: by 2002:a63:318c:: with SMTP id x134-v6mr6278225pgx.60.1529581562531; Thu, 21 Jun 2018 04:46:02 -0700 (PDT) Received: from localhost.localdomain ([47.88.54.25]) by smtp.gmail.com with ESMTPSA id h84-v6sm14506523pfd.69.2018.06.21.04.46.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Jun 2018 04:46:02 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Jun 2018 19:45:45 +0800 Message-Id: <1529581546-5892-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529581546-5892-1-git-send-email-mypopydev@gmail.com> References: <1529581546-5892-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/4] hwcontext_opencl: Remove the opencl_device_init in opencl_device_derive 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" In opencl device derived case, don't need to call opencl_device_init. Signed-off-by: Jun Zhao --- libavutil/hwcontext_opencl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 9e96e96..295d6be 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -1196,7 +1196,7 @@ static int opencl_device_derive(AVHWDeviceContext *hwdev, AVHWDeviceContext *src_ctx, int flags) { - int err; + int err = 0; switch (src_ctx->type) { #if HAVE_OPENCL_DRM_BEIGNET @@ -1362,10 +1362,7 @@ static int opencl_device_derive(AVHWDeviceContext *hwdev, break; } - if (err < 0) - return err; - - return opencl_device_init(hwdev); + return err; } static int opencl_get_plane_format(enum AVPixelFormat pixfmt,