From patchwork Thu Aug 31 22:26:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43429 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:299e:b0:149:dfde:5c0a with SMTP id f30csp572849pzh; Thu, 31 Aug 2023 15:25:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfazL8dECZd+2lyJXiMwcnJxV2Z2qyYv+CVkL8P2W1vNjDYgvCYR0axXqxr1WnqGFSpuK5 X-Received: by 2002:a05:6402:28f:b0:52a:1d9c:83f2 with SMTP id l15-20020a056402028f00b0052a1d9c83f2mr684338edv.23.1693520705691; Thu, 31 Aug 2023 15:25:05 -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 l7-20020a056402344700b0052a47afa07dsi1693128edc.416.2023.08.31.15.25.05; Thu, 31 Aug 2023 15:25:05 -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=By9vu6cQ; 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 C5D3C68C5E1; Fri, 1 Sep 2023 01:25:02 +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-db8eur05olkn2042.outbound.protection.outlook.com [40.92.89.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5751A68C5E1 for ; Fri, 1 Sep 2023 01:24:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FlYXjjawa9epGc4Z8Mg/5/W14g9InMGRllS3Mxru/VINGZdC1XzEz0OAn7yZBJ6fDtw6sXe/Di9EPhwAvZWR04C38dAF2KM0zdFUCSLomXSqTspVJOnec6tHqQu9KV5bP2EM3EMcDaG6AeIj8oh74EdmbUMilWsUhiSt5+CFSLCGVYGdDwbQ56uOz8YyzYc73WAu/wVStVC4ovlkVPkusJZUoeucyg2IXuL/mT5T023SZfERHuRmlfWLLDaAmnDGRvkwCbXnyuOkl4tM0EsOEAq80b1nNN0eNHxc5nEyV5RzH/h5mh1zeU6DKKaiSv/7nLGYiXQWGpq7Q7Bnodwppg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TDtxT+t3JKeu+JO4Q7raAYMKYwwDQ3KwzZs7lsgPiPk=; b=mg39iXtFdxRpxHq7GOVkm5rfDtC0XsvetXzfWWI7dTbNllo0B3jxehimk95ixYKmhr4ZRq6fDtZl+VCtAJEgMyYwLc9KkodVU4IqIBaphj5ODOjUSa8xDfijqqn+GEQD2Xaqkos7bWcQTNzEaZcnjNvDUW7klR6XAG1xJKoZwOx0x7aAX81oe1BYoARIWiI59A0cXX015MZdBsgH4eufnxqBXG86C6Wy181INyjPTtI2UiOP8v432uKxByANLzUIRosJeRsHgsXG5xggVuDG66i5yY/Gt3kVTTc0rCeJzArcIhUs9G4uhaRTsyfDoIeY31PFgFzSh7zzflq3uca6HA== 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=TDtxT+t3JKeu+JO4Q7raAYMKYwwDQ3KwzZs7lsgPiPk=; b=By9vu6cQMqrVhadWdaxMGbe8vIGsYaNdO9o2IBsGJywGLtH084P4I+wCzcHxr3TTOw5ZGSuF58KnmjB1V/3BvsaC2acu52Pj4/U/HtNiEq770idtFGdh4pNY7HqKlsIUF1D3VI9tChtmu1F4DN5wZaUAr2tdxM4Oy7IdgaQm1JP9bIXP+P3iqOrHbSl4j4l7Km/P4TFKMIc8UUYRmucOnWSz/jPmL88Qsuzr8xQokVIPf9jLwdGURJbQunARsXKrWxoTLIA5oeMA6exgHi56OJ1mfK6qKTzqkUbAjTn3KannCu7wgSSEbHKOG1jvuJl30eILAo9w1p0ZLmupBXxtpA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0418.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:27b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.21; Thu, 31 Aug 2023 22:24:54 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6699.034; Thu, 31 Aug 2023 22:24:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Sep 2023 00:26:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [/0jvEfjvFv3fdvlLDyBHGUManyZ5u2TJwXXmABa2ueQ=] X-ClientProxiedBy: ZR0P278CA0141.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230831222602.4161071-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0418:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d81c0e8-efea-44d1-a2c6-08dbaa7119b4 X-MS-Exchange-SLBlob-MailProps: mWtqiNqNgRsL0+9RtTrgguGTkNZds90/ZarIddRxxbOZzDr1R73MReZcFLAl9BpyPVC6WBhiNt/E8UaBLBzqzatjLt4u3zfzM62umRRBrkeRwMuTYHsKZc98h592SGs9Q/0K+MnEDQcsnNLM8fCdpXcdW28+VPoVFnC2Qmpg5qYMB7kIOdCrksKQDZsFAPJpQzmrXShfqVssJXXQVc+ustZkxb02HIE4xZIYKwUpc4mmIp/yQ49QubgqbuC6XsKHms+C9xQ6uaH/8EoG5ozRcPc+bZWbSwyA4Q8g/fHg2RKQ6hl9UVXvyiUfSsFsHXk85cWcEApPkAR6OvBIHwCuEvIh7n3Cs54rwqynjVVndyS7k/5wgHKGZH+Q589Eel9+1hYjeVaC2TB74LhDiCeFvNfE85IEOJWNOa2lFUIqCy8Ebgcew+PyJ3vO0vIusXnLjfAMtTTmTx28f9E4H1VUsjPMK6P4L5MBUFPM73ThXlgUdeUy5O8O9CveKvCjNFdRpmDtOtov4hIdJ2Y4fyw0L2Tw5suJyD15C732DFqKMBqCj3xK7RddVB9k+ww0WhBHn5t58R3lfW21/PA02m64XseHkV8evTLVHk1vI6oowxUTcJ0FeA8+f4kOAJfim3Gf5igBMCzOBk2w1Bs8zfLS7A0m2koNnXi4Gm14YhmnjLSI8PW3G2xtaJzeVf7+v9BweBvljkvH25r/C3vAFiYCoPVay5PwnNmM2kBmCU3PFduvGDfjIt+riLtC/2dmC6maOVPfHRjDQ3d8a//ATJayCjP/IELiRmum4OpVEV0owTc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DtNGJi01kEqVk3kkUeLM+q3AN5o5dJc85nTGHEu0l478MFQWvom6NOzaYRjNkWqrSAjVt2G2D+263WYYgNKaaU0WGRtmADrFFQh2QEaF3QdIyV5KyYCWGnNM50zoBGWytNW+YgUcCsjX4fuTNuNYPEArXhtGnI4q2mpgyHfYiMAIPUGZLreJrR93oS/HOyAxZQlSGUQvzHGn5lMBdlIr2wxzj4D3vEYT4a/2WI9vUEEVxVEwNSFEqHZ2el9v+j9rAkk2ue9iS+hj00gIFU5kYYAcGyN+1VZUh8kVbYl1xd4xpWjgL+hSN+vqQd1jxrarbzhMMbfvKK9MAaeTnPxplLlcLs+y06zwmw3ZntkJJjqW7Tspqc9Z5X7IndbW4yS6KN4/0iyuUlq3VfYXsmQJDps6/afAS89fL/EGgpAZfrMTYgAj5R0Us5LQYtprKJFXE+uFHzx13+aw0JfuiGjV3xCytyD4pB/u6wbnD1YxWsXfr4xRY2J6e10tja+7/r/V6tDt5kNNhmV6iq82H2VFr9/EDB5Xi/j+enbsOJJxlX1hZ702i73UMP5/edjdaWXkaXGWvkd9t7YGyqY22I1N7H4ythlyJmcYIIJsebUCBvM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?EB2/ewdFIzw8V8pyw2fezSYrz5sc?= =?utf-8?q?09IbULPfMnrI8UGfSVFGti+KT58kPLVAPibP8Qv9ACZYZoSnLSTUpmHR6T8JjBkYu?= =?utf-8?q?zyYQsYz4s8/Ns/0e6tiY6nrvj2427y6crxx2ZK87tF6MbPjUVrraX7HTMtlXHZG5/?= =?utf-8?q?ki4O9eCRD7hF5fI4ljmsSsqliWSYfTV+9HWIbHeCBfNK9kT71eSTl7XDBXeau5wt7?= =?utf-8?q?69g97fjRxUBfD8k8eeOc5XYey0+e7T6hwUSSlc+mdkIQwfn4G2pYGVSm50DGWBrVz?= =?utf-8?q?WNncPWQXi029AFEMMMj8y6KyLrUCOEh7x+CpuRayBRMDwz2HXxCmM87XZKG1NJ+Lb?= =?utf-8?q?4eStFo1v3YQv94eqB/6MFC6UTXIuDYZZv/9kYVPDQj59J6jonMxFilpa7WmxnMmef?= =?utf-8?q?MVk4HA/Re0hu4FSP9GVBRu1bobEphK0OdUnaytItktepM1E22PnAUu+zLIV+Iq13C?= =?utf-8?q?clcJ1OUOVQg7cYDN4uxqRz1oDDZMFfWBkjePuj7YM4VllltzMZl5Ves4cfMtlA6sL?= =?utf-8?q?UDpthfiTjdsBKQpzQg42sJjBJK96+k9UAqRXgrQuuMwKJWUDCOhO5oastuYXnQg/M?= =?utf-8?q?NLLwdywBR1MAKha54+8Oa1wApJPioqA/PR5R4+xA8TAsXDJbfAUqN5ylqFNZoVDwl?= =?utf-8?q?CK1qorrBj+HH3UKcJrQczA8XrQpLqTuufaSWykYE98QtEWm3+0STrCukbdbUYObUU?= =?utf-8?q?LIKNA8wTwRgLULLpzuvOseWaoiqPVasB1ivP/ZWLaEmlxnb6JgVTQT197wfjEA/9T?= =?utf-8?q?eevEwa7ZR3uR7I9zlTFyEkupuZ8O+ao+q/B4fpnOT2yMJBgRa48uXwEJpflR7CBBs?= =?utf-8?q?2lvQ1WvCnkySI5wtNP6Tqcjqle4NOw2FDfbwjLYecTQC4XTY27WRsRGBwv5gYzifD?= =?utf-8?q?NbVurC0JIh+F9X5wce4wj1TSuYURi1LqB934BDkw5FHm3+PtMAcAvIMC1ZCC9z6Rr?= =?utf-8?q?doWSqnV0/c5om93xKy+pFV+Jjjm6FVQyjhZ5nvMvnrAY4SStw4mSDodccpNzS1gtx?= =?utf-8?q?2wtuGc8bsQjYUB/R0zupx39F+ZnA8uzHVDyl6Tny0mER2HJQ4pVGQ7Gbqws1LK0Ht?= =?utf-8?q?iaaiVw/HH0MRCWndoklzAYirobgsFhOvTzIaAHaYUD5ltXk+K94HD5t5S505LMavG?= =?utf-8?q?/Nup+kuNN3UlDjrmqVdYzZdZADtYhXKdgyETDe6mnv5YUYful4Y4o6EHjOfP/ULub?= =?utf-8?q?ooB0K06BVa9+7GVIT?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d81c0e8-efea-44d1-a2c6-08dbaa7119b4 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 22:24:54.4818 (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: PRAP250MB0418 Subject: [FFmpeg-devel] [PATCH 14/14] avutil/internal: Don't auto-include emms.h 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: dAVw1oKNyyD3 Instead include emms.h wherever it is needed. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3enc.c | 1 + libavcodec/avcodec.c | 1 + libavcodec/bink.c | 1 + libavcodec/cavsdec.c | 1 + libavcodec/dca_core.c | 1 + libavcodec/decode.c | 1 + libavcodec/dvdec.c | 1 + libavcodec/dvenc.c | 1 + libavcodec/encode.c | 1 + libavcodec/faandct.c | 1 + libavcodec/faanidct.c | 1 + libavcodec/h264_picture.c | 1 + libavcodec/h264dec.c | 1 + libavcodec/huffyuvdec.c | 1 + libavcodec/huffyuvenc.c | 1 + libavcodec/mjpegdec.c | 1 + libavcodec/mpeg12dec.c | 1 + libavcodec/mpegutils.c | 1 + libavcodec/mpegvideo_dec.c | 1 + libavcodec/mpegvideo_enc.c | 1 + libavcodec/ratecontrol.c | 1 + libavcodec/sbcenc.c | 1 + libavcodec/snowdec.c | 1 + libavcodec/snowenc.c | 1 + libavcodec/svq1enc.c | 1 + libavcodec/tests/dct.c | 1 + libavcodec/tests/motion.c | 1 + libavcodec/vp3.c | 1 + libavfilter/vf_deshake.c | 1 + libavfilter/vf_fspp.c | 1 + libavfilter/vf_gradfun.c | 1 + libavfilter/vf_hqdn3d.c | 1 + libavfilter/vf_mpdecimate.c | 1 + libavfilter/vf_noise.c | 1 + libavfilter/vf_pp7.c | 1 + libavfilter/vf_pullup.c | 1 + libavfilter/vf_spp.c | 1 + libavutil/{x86 => }/emms.h | 14 +++++++++++--- libavutil/internal.h | 8 -------- libswscale/swscale.c | 1 + libswscale/utils.c | 1 + tests/checkasm/checkasm.h | 1 + tests/checkasm/vp9dsp.c | 1 + 43 files changed, 52 insertions(+), 11 deletions(-) rename libavutil/{x86 => }/emms.h (91%) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 3cb4e5f029..56c8d239c5 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -33,6 +33,7 @@ #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/crc.h" +#include "libavutil/emms.h" #include "libavutil/internal.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 0700a53b5c..131834b6de 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -28,6 +28,7 @@ #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" +#include "libavutil/emms.h" #include "libavutil/fifo.h" #include "libavutil/imgutils.h" #include "libavutil/mem.h" diff --git a/libavcodec/bink.c b/libavcodec/bink.c index e3822d689c..8d96dee705 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -21,6 +21,7 @@ */ #include "libavutil/attributes.h" +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 37071dfbc7..b356da0b04 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -26,6 +26,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/emms.h" #include "avcodec.h" #include "get_bits.h" #include "golomb.h" diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index c50d005a56..ff3cc2fe45 100644 --- a/libavcodec/dca_core.c +++ b/libavcodec/dca_core.c @@ -19,6 +19,7 @@ */ #include "libavutil/channel_layout.h" +#include "libavutil/emms.h" #include "dcaadpcm.h" #include "dcadec.h" #include "dcadata.h" diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 7eada8e9ab..169ee79acd 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -32,6 +32,7 @@ #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" +#include "libavutil/emms.h" #include "libavutil/fifo.h" #include "libavutil/frame.h" #include "libavutil/hwcontext.h" diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index c57578a208..04282483f4 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -36,6 +36,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/emms.h" #include "libavutil/internal.h" #include "libavutil/mem_internal.h" #include "libavutil/thread.h" diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 7bd50174b7..ce21247081 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -29,6 +29,7 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/emms.h" #include "libavutil/internal.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 32cc903b1f..b92593770c 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -21,6 +21,7 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" +#include "libavutil/emms.h" #include "libavutil/frame.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" diff --git a/libavcodec/faandct.c b/libavcodec/faandct.c index 38c392bbae..b0b11859a7 100644 --- a/libavcodec/faandct.c +++ b/libavcodec/faandct.c @@ -26,6 +26,7 @@ */ #include "faandct.h" +#include "libavutil/emms.h" #include "libavutil/internal.h" #include "libavutil/libm.h" diff --git a/libavcodec/faanidct.c b/libavcodec/faanidct.c index 3921f82dae..f2667fb716 100644 --- a/libavcodec/faanidct.c +++ b/libavcodec/faanidct.c @@ -20,6 +20,7 @@ */ #include "faanidct.h" #include "libavutil/common.h" +#include "libavutil/emms.h" /* To allow switching to double. */ typedef float FLOAT; diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 3192c70a91..bd31f700cb 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -26,6 +26,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/emms.h" #include "error_resilience.h" #include "avcodec.h" #include "h264dec.h" diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 1c79d9842f..f13b1081fc 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -30,6 +30,7 @@ #include "config_components.h" #include "libavutil/avassert.h" +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/thread.h" diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index f040a27095..fe17c1e82b 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -42,6 +42,7 @@ #include "huffyuvdsp.h" #include "lossless_videodsp.h" #include "thread.h" +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 72d6246ebe..b02b3c7a9a 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -39,6 +39,7 @@ #include "huffyuvencdsp.h" #include "lossless_videoencdsp.h" #include "put_bits.h" +#include "libavutil/emms.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index cef8625791..0a8f3d68dd 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -33,6 +33,7 @@ #include "config_components.h" #include "libavutil/display.h" +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/avassert.h" #include "libavutil/opt.h" diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index e645b8e24a..36461a9ae6 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -31,6 +31,7 @@ #include #include "libavutil/attributes.h" +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c index 2d812a25be..5e76d7ac66 100644 --- a/libavcodec/mpegutils.c +++ b/libavcodec/mpegutils.c @@ -21,6 +21,7 @@ #include #include "libavutil/common.h" +#include "libavutil/emms.h" #include "libavutil/frame.h" #include "libavutil/pixdesc.h" #include "libavutil/motion_vector.h" diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 16e8b9193a..6aa979433c 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -25,6 +25,7 @@ #include "config_components.h" #include "libavutil/avassert.h" +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/video_enc_params.h" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 64e66ae958..69e3152c82 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -35,6 +35,7 @@ #include +#include "libavutil/emms.h" #include "libavutil/internal.h" #include "libavutil/intmath.h" #include "libavutil/mathematics.h" diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 649f570c9d..55ce054735 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -26,6 +26,7 @@ */ #include "libavutil/attributes.h" +#include "libavutil/emms.h" #include "libavutil/internal.h" #include "avcodec.h" diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c index fccb0e3ea3..9d6e0b9f54 100644 --- a/libavcodec/sbcenc.c +++ b/libavcodec/sbcenc.c @@ -31,6 +31,7 @@ */ #include "libavutil/channel_layout.h" +#include "libavutil/emms.h" #include "libavutil/opt.h" #include "avcodec.h" #include "codec_internal.h" diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index bed29d3390..e014d5087f 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/emms.h" #include "libavutil/intmath.h" #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 1360343aec..c330303317 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/emms.h" #include "libavutil/intmath.h" #include "libavutil/libm.h" #include "libavutil/log.h" diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 5e7f410214..46a484e15f 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -26,6 +26,7 @@ * http://www.pcisys.net/~melanson/codecs/ */ +#include "libavutil/emms.h" #include "avcodec.h" #include "codec_internal.h" #include "encode.h" diff --git a/libavcodec/tests/dct.c b/libavcodec/tests/dct.c index e8d0b8dd1d..010d0c1ac3 100644 --- a/libavcodec/tests/dct.c +++ b/libavcodec/tests/dct.c @@ -37,6 +37,7 @@ #include "libavutil/cpu.h" #include "libavutil/common.h" +#include "libavutil/emms.h" #include "libavutil/internal.h" #include "libavutil/lfg.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/tests/motion.c b/libavcodec/tests/motion.c index ef6e1ff309..caa8ecb8be 100644 --- a/libavcodec/tests/motion.c +++ b/libavcodec/tests/motion.c @@ -30,6 +30,7 @@ #include "config.h" #include "libavcodec/me_cmp.h" #include "libavutil/cpu.h" +#include "libavutil/emms.h" #include "libavutil/internal.h" #include "libavutil/lfg.h" #include "libavutil/mem.h" diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 9e097c8905..acab098203 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -35,6 +35,7 @@ #include #include +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/mem_internal.h" diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index a10d59ad80..d44dd71eb0 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -53,6 +53,7 @@ #include "internal.h" #include "video.h" #include "libavutil/common.h" +#include "libavutil/emms.h" #include "libavutil/file_open.h" #include "libavutil/mem.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_fspp.c b/libavfilter/vf_fspp.c index 88e887897e..8f44390117 100644 --- a/libavfilter/vf_fspp.c +++ b/libavfilter/vf_fspp.c @@ -35,6 +35,7 @@ * project, and ported by Arwa Arif for FFmpeg. */ +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c index 39971b3120..a71a68ecc1 100644 --- a/libavfilter/vf_gradfun.c +++ b/libavfilter/vf_gradfun.c @@ -32,6 +32,7 @@ * Dither it back to 8bit. */ +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/common.h" #include "libavutil/mem_internal.h" diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index 2aef7751c4..d95ae8f898 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -31,6 +31,7 @@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/common.h" +#include "libavutil/emms.h" #include "libavutil/pixdesc.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_mpdecimate.c b/libavfilter/vf_mpdecimate.c index 8c7824ed22..baba1f183f 100644 --- a/libavfilter/vf_mpdecimate.c +++ b/libavfilter/vf_mpdecimate.c @@ -24,6 +24,7 @@ * Rich Felker. */ +#include "libavutil/emms.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/pixelutils.h" diff --git a/libavfilter/vf_noise.c b/libavfilter/vf_noise.c index ba843eed4e..9f1e2c3691 100644 --- a/libavfilter/vf_noise.c +++ b/libavfilter/vf_noise.c @@ -24,6 +24,7 @@ * noise generator */ +#include "libavutil/emms.h" #include "libavutil/opt.h" #include "libavutil/imgutils.h" #include "libavutil/lfg.h" diff --git a/libavfilter/vf_pp7.c b/libavfilter/vf_pp7.c index f44a5396ea..24a094f00c 100644 --- a/libavfilter/vf_pp7.c +++ b/libavfilter/vf_pp7.c @@ -27,6 +27,7 @@ * project, and ported by Arwa Arif for FFmpeg. */ +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_pullup.c b/libavfilter/vf_pullup.c index 5a00673c41..7245684085 100644 --- a/libavfilter/vf_pullup.c +++ b/libavfilter/vf_pullup.c @@ -19,6 +19,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 83f062b3bf..bb74b20e0e 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -31,6 +31,7 @@ * ported by Clément Bœsch for FFmpeg. */ +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavutil/x86/emms.h b/libavutil/emms.h similarity index 91% rename from libavutil/x86/emms.h rename to libavutil/emms.h index 8ceec110cf..4ec0127457 100644 --- a/libavutil/x86/emms.h +++ b/libavutil/emms.h @@ -16,12 +16,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_X86_EMMS_H -#define AVUTIL_X86_EMMS_H +#ifndef AVUTIL_EMMS_H +#define AVUTIL_EMMS_H #include "config.h" #include "libavutil/attributes.h" +#if ARCH_X86 + void avpriv_emms_asm(void); #if HAVE_MMX_INLINE @@ -55,4 +57,10 @@ static av_always_inline void emms_c(void) # define emms_c avpriv_emms_asm #endif /* HAVE_MMX_INLINE */ -#endif /* AVUTIL_X86_EMMS_H */ +#endif /* ARCH_X86 */ + +#ifndef emms_c +# define emms_c() do {} while(0) +#endif + +#endif /* AVUTIL_EMMS_H */ diff --git a/libavutil/internal.h b/libavutil/internal.h index 001103142b..461c0df9ad 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -43,14 +43,6 @@ #include "macros.h" #include "pixfmt.h" -#if ARCH_X86 -# include "x86/emms.h" -#endif - -#ifndef emms_c -# define emms_c() do {} while(0) -#endif - #ifndef attribute_align_arg #if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2) # define attribute_align_arg __attribute__((force_align_arg_pointer)) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 367d045a02..90e5b299ab 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -26,6 +26,7 @@ #include "libavutil/bswap.h" #include "libavutil/common.h" #include "libavutil/cpu.h" +#include "libavutil/emms.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem_internal.h" #include "libavutil/pixdesc.h" diff --git a/libswscale/utils.c b/libswscale/utils.c index 8e74c6603e..b3cc74331f 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -40,6 +40,7 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/cpu.h" +#include "libavutil/emms.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "libavutil/libm.h" diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 117d4dd35c..51523c258b 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -37,6 +37,7 @@ #include "libavutil/avstring.h" #include "libavutil/cpu.h" +#include "libavutil/emms.h" #include "libavutil/internal.h" #include "libavutil/lfg.h" #include "libavutil/timer.h" diff --git a/tests/checkasm/vp9dsp.c b/tests/checkasm/vp9dsp.c index 44b02d60a2..cecd0dee0f 100644 --- a/tests/checkasm/vp9dsp.c +++ b/tests/checkasm/vp9dsp.c @@ -24,6 +24,7 @@ #include "libavcodec/vp9data.h" #include "libavcodec/vp9.h" #include "libavutil/common.h" +#include "libavutil/emms.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h"