From patchwork Fri May 14 11:01:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27777 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp360143iof; Fri, 14 May 2021 04:01:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyP++oBkPOPoEPGUXBmbPkCVvEuh+P+fWsOcWTDJUC+QMAOjXG76zHB4zpYpd5nb3EEMgy6 X-Received: by 2002:a17:906:3615:: with SMTP id q21mr15649571ejb.414.1620990117481; Fri, 14 May 2021 04:01:57 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id da5si5541904edb.538.2021.05.14.04.01.56; Fri, 14 May 2021 04:01:57 -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=@outlook.com header.s=selector1 header.b=DMIuQsBy; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62D9F687F4A; Fri, 14 May 2021 14:01:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074033.outbound.protection.outlook.com [40.92.74.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1674468030F for ; Fri, 14 May 2021 14:01:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MmQ2TA49M9z0bLsjAKF9dHWU9alErGq07ozuWRx9RDgfm2GqXfDAf220FJWGlvYS8mDXcwCbK4IuL2jw/ZK7DBtS0NAyzvJ6YkAHfpSGyagP/AEPfwodsnY9fiNdC8Bi5JCreUh2REg32FN9P5Yx8x36FraIj5kwKagoWvfIH6zMXLmpgu/0D5xcnQL/shDrYeLaRLcE6FbS6GxSWZLCgGXeJyMlAAM9lyb54gwiaHGGfbzyE7GB7U+C9wmEtvSKmNCz7akQY5TWLFb/wrB86bQPIlxQEVFf50JguDyreSaPf2JdNQSOD4aqDId6BOyUuwNF1o0ue6q2t1DUf3vfgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3PXrrqDs5m9xNGWxyc5Z9xsqFDUeBLpoqU2P+dCoHIQ=; b=ibG02xAofkFf+4ODd0Ma7Bb0RqGRzwIxnfFzlq/5GzNvrLO8O9OZHfq5/5MEgN3/I/0PrPz3Wz4x2qk9ASjoObRUojGqRoPrTRtv65npcqtkZrTQTDPd0ukqXSh5ryGxNA7d4bfsh7zV2IRfU5xr/tNo4smU3pEvMmEVm73iJWqM/Yt7FG8GI0kIy7T7IMsWgTUeegzGMcrgL2WSnzVsudVtxwMNxXVW5GYHW+4xlUAx9y+mpKDpQlZ3VPFvpTc4X6tOp6jMIjUsZ2d5bv9V63fF1G8uCpV8f5WqhMPRguCWyOmsJooDoooi5WGlSzIZ0WYZR2b3UiF9fKBAJBkHew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3PXrrqDs5m9xNGWxyc5Z9xsqFDUeBLpoqU2P+dCoHIQ=; b=DMIuQsByz0xDkc6J9cgwRLDMgB1Rw7Sr7ie1S1+nNRcYOzyjIxLEx6m8Rs5L03kI0D6fIyPudOI0OZANsaIIduKtdOReRKOAsZUkz0aDGmbONF8JcLFKQQBTU/Fp/sjAE1QuHApwXcoUA/az5jtl/PdlClJlrxF7pC2XkgfuIbt7UQZR7mpFgqVIdbHlen4UdPqGHF0xVAVQzUUttAGcQeCfCIO97rvmeEn35raqrwzpbIZOKqwILof+5Ybhe6uIPfVlEyhkAerEMDCK1uQZ8UhKxMa5PmLmJUFh2YB6RLzP1g/FrQwqwyIrzAxa6nwapsP/5AUtB92PeOi8vL8+3A== Received: from DB3EUR04FT034.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::52) by DB3EUR04HT246.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::401) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Fri, 14 May 2021 11:01:45 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::49) by DB3EUR04FT034.mail.protection.outlook.com (2a01:111:e400:7e0c::199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Fri, 14 May 2021 11:01:45 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C4BD735DDCB8A728371B8975FD01F2D4183F10264BC35506D4F8F30D6A45AF82; UpperCasedChecksum:39B5327AE3B000D6A20E8A75F30886ECEDE7273C76CD236D9D9026DC763F5048; SizeAsReceived:7403; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4129.028; Fri, 14 May 2021 11:01:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 13:01:36 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [i4C4w0T/cZ2KmpI4YnFD42HioR/LfrRO3RkmlIa/QCc=] X-ClientProxiedBy: AM3PR07CA0096.eurprd07.prod.outlook.com (2603:10a6:207:6::30) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210514110136.29231-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM3PR07CA0096.eurprd07.prod.outlook.com (2603:10a6:207:6::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.11 via Frontend Transport; Fri, 14 May 2021 11:01:44 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 364e048f-f526-45b3-5243-08d916c7a9ae X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJvJYWuaS7yaeST4sXctcvNKwPDUECLZ7d1YG738Iwvo3RxLJfjM/mUw9EaDn/cCJvHDN50fObC7r1zvWkVv5jJtLBp95AfBSsPtCijG5UXCZVTmITU8rHYyz6tfE035cp343iLY80ZYwGa00UCHwpy7PKYLcQ2NkDmoETFp3d/WkeMTBzckEoavczKZAqw/rBt3LiDBPkxO7m1p6XB02c89h/U1I+qBbr7N9+REjGFrNj3HXWvcYxwN12mnwjMbCE1aFNFZNtxOqH5MPmuL4nicnyoIxfRbi2nMwuoaTaVzYGH81ioJMr4ZmQ9inwQ1MGXd2iu9pzuCnWSj6rOFLx4+EwaJNh2OGH/u1v4y7QukL2+XcYQdNsE5ueWo4evhYHlo1NKoU/ZBZ7oQxdEhf0QD+3dlUoTgqhL6KGv/4HP6K3sJg9R7nznX2IoysQdALFli0ALfrVwDasowQchsFzBlRNvyvMsjDeu2rJHsewDvCXbqhOdnAdHTPZNJ40bvONfXjTQD7wbdRP4cVqganKuCReBvQKNqp6os4zY9gNFXmI52cgTqcVRfoPdAZKCdf9GZgR2kcLUVhlKnKS4jVbzeJ9uraZ57cpj0HICA2nGjEr2CDDJOnBndDdoW4VzsfwT2aiq4QyyeYVmCUkwC3Ay3RZisb2mz623OPoZuBwmWryzrx08VWcvCpaZkezPT/X2y0tQpSzKPw== X-MS-TrafficTypeDiagnostic: DB3EUR04HT246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qVPP6UPyKjoKKMOkFVqE+IKRrU8OCqplPJpPsrIqSPG3CBxwmfgQlcmrC/FqPbgNnhY1RED+4Recim0dd4JXCmJ5ukPFlh7opHfA3f6IduuAgeQkiWAog5XwB9KJmG0kA12+5qFXmb7W6akv/yZd3Ql50c8bscDsRk0TsQ++pHcGiES84/bqeJMnYJvnpQNypmWNfJxYsbnrhscQd5sYk6/fAdoEaRb5aFRjxm4sIstdaaEKCZ9rJSxgsvD6D7Wuhxlq/O0WV7t3bHa08/uzm40nZuFHjhuN3cG5LuXu62udVuUAiaT+CIT2NnxrOk+XAlwoSpWV70dyvVp1Kjq2wGFvL14UbcLutvp8br+1xThvi+fT+RfwHXPY1ASYuz/4jdmFf0mOCF/sB68345K0YA== X-MS-Exchange-AntiSpam-MessageData: 7E8TACzIk9Lpf8ygszVJjDlc7bMLdGgwocylTpm5UoztZJBHyj1DiN1fKa5v9/DEdhVyb6a2lwKzcviOITkI5YrUwJmOSFz4HYEI72SgEBs6h/JnR7oPLfQdnBEAE3qtpF9AUj+fHTdaKhrRAAZDLw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 364e048f-f526-45b3-5243-08d916c7a9ae X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2021 11:01:45.3031 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT034.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3EUR04HT246 Subject: [FFmpeg-devel] [PATCH] avcodec/libx264: Fix redundant setting of caps_internal 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DZWl4VZEmqoB Exists since 8a129077cc37202a00dd666bd5365c3f61ea2e80. Fixes a -Winitializer-overrides warning when building with Clang. Signed-off-by: Andreas Rheinhardt --- libavcodec/libx264.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 22c91d8df7..1c27f7b441 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1153,7 +1153,6 @@ AVCodec ff_libx264_encoder = { .close = X264_close, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, .priv_class = &x264_class, .defaults = x264_defaults, #if X264_BUILD < 153