From patchwork Thu Jul 22 23:38:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp941698ios; Thu, 22 Jul 2021 16:39:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvFa8CrGHnGLE76z5Z4WNStbUM/wld4wWTQSBbTKC11my9yKrhGcRQ3QMhWb7NxBGzQ/Dj X-Received: by 2002:a17:906:4e15:: with SMTP id z21mr2160531eju.333.1626997167209; Thu, 22 Jul 2021 16:39:27 -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 p13si4814913eja.744.2021.07.22.16.39.25; Thu, 22 Jul 2021 16:39:27 -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=VNj6yfXI; 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 1A2DE68AC2D; Fri, 23 Jul 2021 02:39:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2103.outbound.protection.outlook.com [40.92.89.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0A60689BDB for ; Fri, 23 Jul 2021 02:39:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NsZwQ3fQdI49pe2xqdiIXKtmDuqAVe/DoGAW6eJATLF2sB+XbiiF3kSzZ5MCDvz+pkR/NHVxTy8mJu6j61f3S6/NBl7/csRpuwKGdIzeGLUvlW6fNA7K4Mx8IuZv07hwys0DdgjDwKbzJf+q4sWxHMwROyJMW8wIsOhQb2Tu7nBlmIn36H1xy8xTGtWY4+OL1sWOGKvELlJS0BwLMRji9bLOxUwf8+0+LshJeiJKCQPJazYhNdNI4DfII2GVTfTrKsv5zdl+vrIIbZWLwqtyJr4bDhf0tVLe6BGIrw5hXrFuXt7mEv0eJtaZRFYoj2f95kMNCQWTlQydyOOgqGquBA== 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=FfhQHyRVSa1plTh4HkQJIzr24vo7vtb09IpMGF/vJUI=; b=X+Lyo+V3MFbNagSDUC+bMHI0/WSFbm5sVWpNWUqhT2w6Mw2n15wA1kUewv16uBTG/oOzNlwq8rNLz3h29Z4V4j2NMYl9puui2aDLr/98NVUFYJHoVWFRhk0HGyBj3x+KXJomyauDPeStrPlUwtKKUbuEicLubwofQYJaII4Ih+nLQq1B8bEiVXGCo5aGrFWZ8YMNbJWzIdq/Fc2ZZwBJi6ofMPbgB3zLBiukUd0lKIwIB8BYKKZRS+OHVCMAzjlXJCoDm864EhbiLKOUYgB+1TJsJ5b4HJIbC3dQy0+5qJ0Rr7Qk6Z9VXrCpYlK3W7YjOdd3Ermu3CDjA9Hp+KlkyA== 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=FfhQHyRVSa1plTh4HkQJIzr24vo7vtb09IpMGF/vJUI=; b=VNj6yfXIdOw20SKDoTNHahQHGn9haDGo+lUoLXUVh1xjlzK0fVYf/46gd3LL19+NTmeYBI5XBeDiL+FcmDWs3xEivsWficc3oK47H4xRNxargIBAzKA106osru++xQjcGJeXb7XshC/HA3uOijHHjq753SMfHt9SDAY32yp5UiUClaoin9ly3p9SiWzX7p5PPIPCbSWACIkLTjbXsZylsS8Dysn0PdVeTt4kM2OFm/us3zh8iCKi05TE+XCGwVsIhml5TKgifoAal8ngB6Z84xciBn3P61utl4DDUV0BOgmLK0Hp7ZlD4lJoPzbHVvfwnVYrPd/FYIbE8sOgHeNyYQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3091.eurprd03.prod.outlook.com (2603:10a6:206:18::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25; Thu, 22 Jul 2021 23:39:13 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%7]) with mapi id 15.20.4331.034; Thu, 22 Jul 2021 23:39:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jul 2021 01:38:56 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [9i9Rt/EHlQ67ZeR7CFgLOQkd96qZoBKS] X-ClientProxiedBy: AM0PR10CA0016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210722233856.730514-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR10CA0016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25 via Frontend Transport; Thu, 22 Jul 2021 23:39:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 455cb910-1404-4122-1db7-08d94d69e91a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRrhZOajZ3oqlUQPOtMRnoqotZnXlylVaBYU7bGWsuC1vNtVFhvDpIbnrlmuDYNSq+hFBapTn9mFaTqcNAPzsGTSA9NzbANdE7fcbAZ+OO8fTY1pJEhkG8vCnJgSHLb3uzXAGyorgPav8n2mU8Mk7BWl177U+pBtJfFUJZsdwZ1fB/aIZPOXnpDzCQc1yAHs/dbxRE5M6ZInhJW+QQOjw0vrrszC01LVR9NyR3EPc0JqpU1eK/EpfvImWvQzKQ3/g57xxD6s5LnqpNl5YFw2ZdU1xpNvR2GSZzvJARJojugN5PpE1f46i8mevWVQBGtXzKVe3mlj4bvpvVAy/9V0UyEnXXPjb5B7GssC4CKudN8x0jAWo9sTQzS7MTA8ZpMC3GGDeHAFdQKAVBiS7YCmQHKb/HSM72FoANuIYV681F7HzcC2+GnTIZGtR2PvjAfflBjg2pa5QunFwXQPOTiiCYxKkFYeRTDrscO7xWplM8S1xndgrTeYxf24SMtPjbFi7RiLiNoW6q+rdP3SDQm+rBvG1/mryHT8Bh/kJ/CGHlU3Y8yDZn9tMh+gNlOTuhbXBs2GWoptiEG/wtkP2mYu19e9KLfU7cLfYUClCMTkCU0DtVjfa63YKNTG9eozCos0Hntx8NepXZJtvXABEjAKme2X3aAJN1Qn7g8G++AJU67ghStsd2F3mx6ii5nlkKHMI+wIEpUYxL1l85VorYC6MGH/AMMY1noqrwjUbdW3QxGLSWBRn70uChzM+2R6ge1Px0= X-MS-TrafficTypeDiagnostic: AM5PR03MB3091: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XxY0hCG0M8JUfaqA7Phe3HFBHrzflrHkDfaJSbbjSJxCRniufotc67DcaIzD9ruDpNGmHDT/cgZvWSjK58diVk0nxFgOufjx5Gf1fcfPZV/6PrajFk9hGz42WXpQ/7uols5IX8CqUkVvgngLuf7U8AWGZPpv+CeHF01zNT8b5jVKTbd7oaekva82hzK3mJWZrqXefvGB2w6QECo65yW1zm2NkwQAp/lcKUdusVJfuEpeIpKZOucS5QIgo9T9+P4xam/5EpmzK82MbOPmx4Pe0B14GoPpI45qXnesZLfW8oN6BfdTDu6wFY6RjdvkaTwd9R6SYocUvDV0JK0a7ZGesqGXp+eebior5B+kOnq0/BrQCF4h+3sfOpUsT4KGoAGQjl7p+l7iK2KFErPVb4KTzDcuT/owwL8HUgcKjMMs1blkTfn8G4ggon0K2ggGzD3E X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eBeyR+WnWQ66qHXfPoXRIeS6KAJhIjXxe+zlE+AAi5ewrstPhe1ADFCw0lDCWC2FRc1DzQaJ51hqW/KYUwCZC63nWaXf6ZVXOGiCD2sZr211rbb7NQnunSpDhj3H1AJyLYL5hRcvhSTLEfH1Z1g9zQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 455cb910-1404-4122-1db7-08d94d69e91a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2021 23:39:13.2779 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR03MB3091 Subject: [FFmpeg-devel] [PATCH] avcodec/tableprint_vlc: Fix building with hardcoded tables 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: eAU2cgkGpIdS This has been broken in 25c8507818d8559a6654a5b30a0f8aae11a48181, because the hacks for headers that are incompatible with building for the host in libavcodec/tableprint_vlc.h have not been adjusted. Moving AV_INPUT_BUFFER_PADDING_SIZE to defs.h which is valid for both the target as well as the host allowed to remove some of the hacks. Signed-off-by: Andreas Rheinhardt --- If we did not have monster headers (with lavu/internal.h forcing one to include libm.h if all one wants is ff_dlog and avpriv_request_sample()), one could include the headers normally; but one would still need to define both of them away, as the underlying functions are not available for the host. In particular, mem.h could be ridden of the avutil.h dependency to allow it to be included (albeit with the allocation functions overriden). libavcodec/tableprint_vlc.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/tableprint_vlc.h b/libavcodec/tableprint_vlc.h index b3ff36562b..0cbd7a9d2b 100644 --- a/libavcodec/tableprint_vlc.h +++ b/libavcodec/tableprint_vlc.h @@ -33,9 +33,7 @@ #define av_realloc_f(p, o, n) NULL #define av_free(p) while(0) #define av_freep(p) while(0) -#define AVCODEC_AVCODEC_H -#define AVCODEC_INTERNAL_H -#define AV_INPUT_BUFFER_PADDING_SIZE 64 // the value does not matter for this +#define AVUTIL_INTERNAL_H #define avpriv_request_sample(...) #include "tableprint.h" #include "get_bits.h"