From patchwork Thu May 19 22:52:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35839 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp313488pzb; Thu, 19 May 2022 15:52:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDUXdkbGnnuc4CIdGCFv3/MgNstSsiMtFohXx21VHzjLxWodQuv+aYFxD7WlGRvcGI0zwH X-Received: by 2002:a05:6402:1ca5:b0:42a:a393:ff02 with SMTP id cz5-20020a0564021ca500b0042aa393ff02mr8116078edb.76.1653000766891; Thu, 19 May 2022 15:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653000766; cv=none; d=google.com; s=arc-20160816; b=mxRoIfoJSwSD5uQKAAoRXE+zKb0xV87qsyMamMkqzgQgpITamXExabOFzl3Mt36Fri aN1LLUuM++Wso5zHbySgJdsaiOLpWNWc+kH8HWhmVGmmyvvW3MURZXcTTHcisw+F8FNG 9hRxAxwZdnsS9895YQSNnxLu12etn8ly37TRKhPkkNsskPfIpVKZDJNsTkzfJPBx+eS7 zsEj7kvJC/gyXHGsfUrLZ1o31xhERpMbBi0pFzfi11RSvcUBEJfnz7WGycu1l4Ec8n5B 7UZRbUWUhKfdZbHiL5uXOnMyqyTvNulNjX4whq6E65QXCEw2ZdkP/aaCtSn/6cTHsL9j uzWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:message-id:from :dkim-signature:delivered-to; bh=6bTSlFRfpWTkRicz8vj3LZbx/oQON9cUoEAAv6lekMg=; b=a0/WIMBk+omyVbWFHpwokzRPrvioRM1SKU0JV6VCKQNw7VRfTJ9eAWwDh5jOQf45mG ykYhYPXStodFMiePMiR92z2VvfkHE/zOrIfPrDhN6HMGVGfmvURHbcqMPI5TfSP9r2nD R5oR3qQlQvUTHLPKYOoEJ5pDSxt8lkhGYrzjjw2U672Yi32fT636rbIX2rZBInwy4X9T ECLg1ZbnSag6Xk0Di9KnX9ASJXfkZtFTZoopjo/fxY95LNIXn+5Si7j9qQqQQR0nRC9L CVWfDrw4QcDaiP/XeTrdMzDmxjom3158+5kZkZE81jd5a5EZxDC7LtdJsekRpMvKzej2 VfMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AA7MfyXY; 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 bi8-20020a170906a24800b006f39ef3b072si6190759ejb.658.2022.05.19.15.52.46; Thu, 19 May 2022 15:52:46 -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=20210112 header.b=AA7MfyXY; 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 DF07468B498; Fri, 20 May 2022 01:52:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED79768B0EE for ; Fri, 20 May 2022 01:52:35 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id v10so6247293pgl.11 for ; Thu, 19 May 2022 15:52:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:date:subject:fcc:content-transfer-encoding :mime-version:to:cc; bh=qeCgwVFukrvEuU4nkcYeBXCn8/sniTz6mrni+0QU4qU=; b=AA7MfyXYTZij/FIZhA29lVJElqspZoF+8WBAn7KYM3wOrMqxITCkV24iGiYPR4WQ8s hOeoxDOFcvYTxqqroc/1NQTknE7xRepIaZi+9vTNrlkjVpVhBlmsjq1a71+82Q1J/Hxi +QbtkVKXf5Y5Fd8RxNg5ApCjFnExbK2HcO3gS6JLt3b69lBlRtdgp0AY03qtTjxotxvv Bw9rjjj5g46dv4jkOc4ZyL3p22b5eoM+cGFlMwuIa3fxrXYdgcbaSHW+BpJu2D/C4IbU DUUWhN0xHFH4YAf1uhBPqE94zJn9h3XfSHN3d4iiBXHoGWqE8tlDyXwZqsNa/BPkac7v PSIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=qeCgwVFukrvEuU4nkcYeBXCn8/sniTz6mrni+0QU4qU=; b=J7TkH0AlI2xj8DJ/DbBLhr4dUC1keUCzv05Imp+I+417QNkdCefjxBqU/MyqgsSlqU EEl6PX1IhBOhKOjsGdraRvr9JGNM9VwaBpU+ERgKC/fURRuFsecRFSpkdZGkcQHN28Tu XPqpmBo2ftc6YL0f6PJ3zsHsLeWgl1V2P9ps/lZrpif+6oBzGW5DtJFltizzCnkLRF9B 9RK7dYh4gKktVgb2E4g8h8+TPcmkRK16r0wotmpKS0NVULPTFxu4KmCCl/YiITXWxXp4 zogfe4J9Zx8OD0uTM7OEqY+HKbXjf46uWhZagWYiK5l8QbJVZsz66LEefnbY94ZS1sCn vepg== X-Gm-Message-State: AOAM531BxhkAFmqyyhxiBpO9GL1quYz8L3LF1z9R+7PhfTJDZtcAPOII dBeywPMbOzbW8tdcrnceojCzxNJn4Xo0qA== X-Received: by 2002:a63:6a86:0:b0:3c5:e6c0:cb9f with SMTP id f128-20020a636a86000000b003c5e6c0cb9fmr5942649pgc.365.1653000754124; Thu, 19 May 2022 15:52:34 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id o10-20020a170902d4ca00b0015e8d4eb228sm4389396plg.114.2022.05.19.15.52.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2022 15:52:33 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: Date: Thu, 19 May 2022 22:52:32 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avcodec/libx264: don't define X264_API_IMPORTS when compiling static X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YKdoAkhorW6e From: softworkz The definition of X264_API_IMPORTS is required for shared linking (when MSVC is used) but it must not be defined in case of static builds as is stated in x264.h: https://code.videolan.org/videolan/x264/-/blob/ bfc87b7a330f75f5c9a21e56081e4b20344f139e/x264.h#L63-67 This commit adds a check for the definition of _LIB which indicates static linking. Signed-off-by: softworkz --- avcodec/libx264: don't define X264_API_IMPORTS when compiling static The definition of X264_API_IMPORTS is required for shared linking (when MSVC is used) but it must not be defined in case of static builds as is stated in x264.h: https://code.videolan.org/videolan/x264/-/blob/bfc87b7a330f75f5c9a21e56081e4b20344f139e/x264.h#L63-67 Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-29%2Fsoftworkz%2Fsubmit_x264_api_imports-v1 Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-29/softworkz/submit_x264_api_imports-v1 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/29 libavcodec/libx264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 41a558fea06cc0a23b8d2d0dfb03ef6a25cf5100 diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4ce3791ae8..2304bbb774 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -37,7 +37,7 @@ #include "atsc_a53.h" #include "sei.h" -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(_LIB) #define X264_API_IMPORTS 1 #endif