From patchwork Wed Jun 6 15:31:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruiling Song X-Patchwork-Id: 9269 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp973177jad; Wed, 6 Jun 2018 08:32:02 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJT8sMgAgrQNkz9ANHBHYlM1hPusB+ShGDXqEIJEE2+ogTYlkmD8809pkHT+ZF9eqTw3Xkm X-Received: by 2002:a1c:aac3:: with SMTP id t186-v6mr2144858wme.14.1528299122753; Wed, 06 Jun 2018 08:32:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528299122; cv=none; d=google.com; s=arc-20160816; b=XdcePfUrIVW4kVix7HxrP32KszfPp9PrdF02NJ0+CSHFaDV44+2SAVgF7shlLRJ8wi NWx8ggac9J8vPKYOaPfLfVOBX/mvhAPxaM8fesVrdLp1Ne872k81UnWwr54FF46vux4h X9jS69+sBJxtNma12R/jq1zjDveKv9LLdIbuT61E/w+CLjlUajcbvaP9UaLZAS3zkyFf q6k/67Jgbk/YyxGLbWgo1dE3fhJ+m/T4+ZhQIHToN7qH8vZl6t4gBqq2oVWIfaQxOUVk gb8uLojAenVLlMFfgl2BSOjo4idbE5GAkOuxnmErYDqA2NoZCpn7u/oh7NeCSMcmQAji I5Kw== 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:delivered-to :arc-authentication-results; bh=FK6B9xvZnpc5RFDPzyx4IuMTOI0OT+BLsAI9KMKwGPE=; b=vh0OgBBavdM36ikTUfntyVNB+RFBlGEhlI2LZqjFX8OdWUw7053lzdBHatSuTNpIkp WVMKAaF1FevYqpzu/CQ2XrBL8ZQtuQgdZ1ISDjduDnjvhOO5lTzMb34dc38MycVCeFX6 Yuy2HsytcIVhSCxvTonbDUt1yXiuTC7tpJhTnS4r9y3ihZ2D1xD8Qitdr9b0tlig09DV Q8dk6h/pg1tn5fxK0uhCZHPjkZvBJSEMm1fLFBaueIgAJFUPUYrfo4Cpjq6FNJvNtH5B o2dEM0CMBXOp2M+/ihWmWmV0YvlCx40V8TiWqWBQffLTI5rbYVzyaJ8pBdHbFmiaSTP0 BUQg== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v188-v6si3218165wma.45.2018.06.06.08.31.46; Wed, 06 Jun 2018 08:32:02 -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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9227768A6AE; Wed, 6 Jun 2018 18:30:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AE4C68A42F for ; Wed, 6 Jun 2018 18:30:50 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Jun 2018 08:31:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,483,1520924400"; d="scan'208";a="61791926" Received: from ocl-kbl.sh.intel.com ([10.239.160.52]) by fmsmga001.fm.intel.com with ESMTP; 06 Jun 2018 08:31:34 -0700 From: Ruiling Song To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jun 2018 23:31:44 +0800 Message-Id: <1528299104-26785-1-git-send-email-ruiling.song@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] lavu: add calling convention for OpenCL callback. 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: Ruiling Song MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fix a build error on Windows: C2440: connot convert from 'void (__cdecl *) (...)' to 'void (__stdcall *)(...)'. Signed-off-by: Ruiling Song --- libavutil/hwcontext_opencl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 43b5c5a..e08d7bc 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -141,9 +141,10 @@ typedef struct OpenCLFramesContext { } OpenCLFramesContext; -static void opencl_error_callback(const char *errinfo, - const void *private_info, size_t cb, - void *user_data) +static void CL_CALLBACK opencl_error_callback(const char *errinfo, + const void *private_info, + size_t cb, + void *user_data) { AVHWDeviceContext *ctx = user_data; av_log(ctx, AV_LOG_ERROR, "OpenCL error: %s\n", errinfo);