From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 864B740C24 for ; Wed, 29 Dec 2021 06:16:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5B3F68ADF2; Wed, 29 Dec 2021 08:16:44 +0200 (EET) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13AAE68A717 for ; Wed, 29 Dec 2021 08:16:38 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id j6so82253456edw.12 for ; Tue, 28 Dec 2021 22:16:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=Zh8mR3cE5MCrrRfzbhHJafAhO9O3rUMwJtBkgRekd0k=; b=GQswcg8+WkY2cBWQpBKrvF1+PFzzpWJZfdtrMPQYfs4TVws4Zumf6WzYZhuWi5+kgZ 4o/jJYcG5kItKZ2Eoiz9oA8gxGcYU3+C35WQQJ9ZdVmBQUjnWyWDTSGA9q6I/wr8xWdl RWTgNx4vEwZx6KVQ08Zpj/vpgUK5BSc0rxQj1htegPLGM7KXvHw6THlRFso8dFvnhcxT VsrBOLsxXY2Wm/TRVL2eWxnO8YNAMwJ1Sgm7u2QC/Ceyf6CbHwZTFgyLf0kgmhLIIRj1 vM+VRRN0XmT+LY+Rqege8AlLKOKq4l9c7Chdy7staibdsi58a34OBJrwkV2oYQtiAaYw m7SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Zh8mR3cE5MCrrRfzbhHJafAhO9O3rUMwJtBkgRekd0k=; b=sO9aJ5k2rntwnbLI65ppyPYqhxJL8OoxTxvKCsIRODL5/nYXDhKSz9Z8LsU/wX1RJS GSHrm3xwlhUW+Mzal3maLi4HDAkOf2o0uYEOnD5pdwuUNzI2Gh/glN7/B+IbktNRtDR9 gXPJrgnvwRRkxNSZqi+9pKk+IJ34GMSzwe7/I/AiS4As0KojaH5Ap7iRlhyUL1xrLH1b 9P0v6GJR6VZYZ44ZQUBjQPTIESIGxh5Rmt8V6ZyG6cXC/qHAB3hNJ5LnIXyC8t3uQKAD c7n49cih28Am1LnoxM/aJE6hSZEgJKslTW77NagqkqXuvK95HUMOBZZAJ7QO9Fc7dLvq ViMA== X-Gm-Message-State: AOAM533L6Z3bT3RachvlfQ+8izohoDwHMTdQQmBrT01h8e5JWnLA6rJo 9eNO17PiIbvv3VIUIjdk3WdWfBLetnEuEvsM8O5ZF0Z49Sw= X-Google-Smtp-Source: ABdhPJxvKyuG839kieMboD5FbwapBGWgZyyju0yu6IzFSoEKCYXEYqObQYrapdrW6PMn9NCNaxDD+qnzBAMSeWPfP0s= X-Received: by 2002:a05:6402:1d81:: with SMTP id dk1mr24387466edb.328.1640758597184; Tue, 28 Dec 2021 22:16:37 -0800 (PST) MIME-Version: 1.0 From: Matt Oliver Date: Wed, 29 Dec 2021 17:16:25 +1100 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="0000000000005900c505d442e12d" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] libx264: Set min build version to 158 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --0000000000005900c505d442e12d Content-Type: text/plain; charset="UTF-8" Was "[PATCH] libx264: Do not explicitly set X264_API_IMPORTS" Setting X264_API_IMPORTS only affects msvc builds and it breaks linking to static builds (although is required for shared builds). This flag is set by x264 in its pkgconfig as required since build 158 (a615f027ed172e2dd5380e736d487aa858a0c4ff) from July 2019. So this patch updates configure to require a newer x264 build that correctly sets the imports flag. Alternatively we can detect the x264 build version in configure and keep the fallback of manually setting the flag on older x264 builds that arent using pkgconfig (to keep the old behaviour) but that requires some complex configure changes. Signed-off-by: Matt Oliver --- configure | 8 +++----- libavcodec/libx264.c | 4 ---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/configure b/configure index ede8f9777b..b35728aace 100755 --- a/configure +++ b/configure @@ -6535,11 +6535,8 @@ enabled libvpx && { enabled libwebp && { enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } -enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode || - { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && - warn "using libx264 without pkg-config"; } } && - require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && - check_cpp_condition libx262 x264.h "X264_MPEG2" +enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && + require_cpp_condition libx264 x264.h "X264_BUILD >= 158" enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && require_cpp_condition libx265 x265.h "X265_BUILD >= 70" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 21f434d06d..efbc9608c7 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -34,10 +34,6 @@ #include "atsc_a53.h" #include "sei.h" -#if defined(_MSC_VER) -#define X264_API_IMPORTS 1 -#endif - #include #include #include -- --0000000000005900c505d442e12d Content-Type: application/octet-stream; name="0001-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch" Content-Disposition: attachment; filename="0001-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kxr5aoc60 RnJvbSBkNWZjYTc0OGQ3NjYwMmE5MTI1OTBiNjQwMjI1NjAyODNkYjZmYWU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0IE9saXZlciA8cHJvdG9nb25vaUBnbWFpbC5jb20+CkRh dGU6IFNhdCwgMzAgT2N0IDIwMjEgMTQ6MDk6MjkgKzExMDAKU3ViamVjdDogW1BBVENIXSBsaWJ4 MjY0OiBEbyBub3QgZXhwbGljaXRseSBzZXQgWDI2NF9BUElfSU1QT1JUUwoKU2V0dGluZyBYMjY0 X0FQSV9JTVBPUlRTIG9ubHkgYWZmZWN0cyBtc3ZjIGJ1aWxkcyBhbmQgaXQgYnJlYWtzIGxpbmtp bmcgdG8gc3RhdGljIGJ1aWxkcyAoYWx0aG91Z2ggaXMgcmVxdWlyZWQgZm9yIHNoYXJlZCBidWls ZHMpLiBUaGlzIGZsYWcgaXMgc2V0IGJ5IHgyNjQgaW4gaXRzIHBrZ2NvbmZpZyBhcyByZXF1aXJl ZCBzaW5jZSBidWlsZCAxNTggKGE2MTVmMDI3ZWQxNzJlMmRkNTM4MGU3MzZkNDg3YWE4NThhMGM0 ZmYpIGZyb20gSnVseSAyMDE5LiBTbyB0aGlzIHBhdGNoIHVwZGF0ZXMgY29uZmlndXJlIHRvIHJl cXVpcmUgYSBuZXdlciB4MjY0IGJ1aWxkIHRoYXQgY29ycmVjdGx5IHNldHMgdGhlIGltcG9ydHMg ZmxhZy4KCkFsdGVybmF0aXZlbHkgd2UgY2FuIGRldGVjdCB0aGUgeDI2NCBidWlsZCB2ZXJzaW9u IGluIGNvbmZpZ3VyZSBhbmQga2VlcCB0aGUgZmFsbGJhY2sgb2YgbWFudWFsbHkgc2V0dGluZyB0 aGUgZmxhZyBvbiBvbGRlciB4MjY0IGJ1aWxkcyB0aGF0IGFyZW50IHVzaW5nIHBrZ2NvbmZpZyAo dG8ga2VlcCB0aGUgb2xkIGJlaGF2aW91cikgYnV0IHRoYXQgcmVxdWlyZXMgc29tZSBjb21wbGV4 IGNvbmZpZ3VyZSBjaGFuZ2VzLgoKU2lnbmVkLW9mZi1ieTogTWF0dCBPbGl2ZXIgPHByb3RvZ29u b2lAZ21haWwuY29tPgotLS0KIGNvbmZpZ3VyZSAgICAgICAgICAgIHwgOCArKystLS0tLQogbGli YXZjb2RlYy9saWJ4MjY0LmMgfCA0IC0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25z KCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZSBiL2NvbmZpZ3VyZQpp bmRleCBlZGU4Zjk3NzdiLi5iMzU3MjhhYWNlIDEwMDc1NQotLS0gYS9jb25maWd1cmUKKysrIGIv Y29uZmlndXJlCkBAIC02NTM1LDExICs2NTM1LDggQEAgZW5hYmxlZCBsaWJ2cHggICAgICAgICAg ICAmJiB7CiBlbmFibGVkIGxpYndlYnAgICAgICAgICAgICYmIHsKICAgICBlbmFibGVkIGxpYndl YnBfZW5jb2RlciAgICAgICYmIHJlcXVpcmVfcGtnX2NvbmZpZyBsaWJ3ZWJwICJsaWJ3ZWJwID49 IDAuMi4wIiB3ZWJwL2VuY29kZS5oIFdlYlBHZXRFbmNvZGVyVmVyc2lvbgogICAgIGVuYWJsZWQg bGlid2VicF9hbmltX2VuY29kZXIgJiYgY2hlY2tfcGtnX2NvbmZpZyBsaWJ3ZWJwX2FuaW1fZW5j b2RlciAibGlid2VicG11eCA+PSAwLjQuMCIgd2VicC9tdXguaCBXZWJQQW5pbUVuY29kZXJPcHRp b25zSW5pdDsgfQotZW5hYmxlZCBsaWJ4MjY0ICAgICAgICAgICAmJiB7IGNoZWNrX3BrZ19jb25m aWcgbGlieDI2NCB4MjY0ICJzdGRpbnQuaCB4MjY0LmgiIHgyNjRfZW5jb2Rlcl9lbmNvZGUgfHwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7IHJlcXVpcmUgbGlieDI2NCAic3RkaW50 LmggeDI2NC5oIiB4MjY0X2VuY29kZXJfZW5jb2RlICItbHgyNjQgJHB0aHJlYWRzX2V4dHJhbGli cyAkbGlibV9leHRyYWxpYnMiICYmCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3 YXJuICJ1c2luZyBsaWJ4MjY0IHdpdGhvdXQgcGtnLWNvbmZpZyI7IH0gfSAmJgotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZXF1aXJlX2NwcF9jb25kaXRpb24gbGlieDI2NCB4MjY0Lmgg IlgyNjRfQlVJTEQgPj0gMTE4IiAmJgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGVj a19jcHBfY29uZGl0aW9uIGxpYngyNjIgeDI2NC5oICJYMjY0X01QRUcyIgorZW5hYmxlZCBsaWJ4 MjY0ICAgICAgICAgICAmJiBjaGVja19wa2dfY29uZmlnIGxpYngyNjQgeDI2NCAic3RkaW50Lmgg eDI2NC5oIiB4MjY0X2VuY29kZXJfZW5jb2RlICYmCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJlcXVpcmVfY3BwX2NvbmRpdGlvbiBsaWJ4MjY0IHgyNjQuaCAiWDI2NF9CVUlMRCA+PSAx NTgiCiBlbmFibGVkIGxpYngyNjUgICAgICAgICAgICYmIHJlcXVpcmVfcGtnX2NvbmZpZyBsaWJ4 MjY1IHgyNjUgeDI2NS5oIHgyNjVfYXBpX2dldCAmJgogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByZXF1aXJlX2NwcF9jb25kaXRpb24gbGlieDI2NSB4MjY1LmggIlgyNjVfQlVJTEQgPj0g NzAiCiBlbmFibGVkIGxpYnhhdnMgICAgICAgICAgICYmIHJlcXVpcmUgbGlieGF2cyAic3RkaW50 LmggeGF2cy5oIiB4YXZzX2VuY29kZXJfZW5jb2RlICItbHhhdnMgJHB0aHJlYWRzX2V4dHJhbGli cyAkbGlibV9leHRyYWxpYnMiCmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2xpYngyNjQuYyBiL2xp YmF2Y29kZWMvbGlieDI2NC5jCmluZGV4IDIxZjQzNGQwNmQuLmVmYmM5NjA4YzcgMTAwNjQ0Ci0t LSBhL2xpYmF2Y29kZWMvbGlieDI2NC5jCisrKyBiL2xpYmF2Y29kZWMvbGlieDI2NC5jCkBAIC0z NCwxMCArMzQsNiBAQAogI2luY2x1ZGUgImF0c2NfYTUzLmgiCiAjaW5jbHVkZSAic2VpLmgiCiAK LSNpZiBkZWZpbmVkKF9NU0NfVkVSKQotI2RlZmluZSBYMjY0X0FQSV9JTVBPUlRTIDEKLSNlbmRp ZgotCiAjaW5jbHVkZSA8eDI2NC5oPgogI2luY2x1ZGUgPGZsb2F0Lmg+CiAjaW5jbHVkZSA8bWF0 aC5oPgotLSAKMi4zMy4xLndpbmRvd3MuMQoK --0000000000005900c505d442e12d Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --0000000000005900c505d442e12d--