From patchwork Wed Dec 22 03:30:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32830 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6024612iog; Tue, 21 Dec 2021 19:30:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzMnuHBlXHaVLPPlfckKyqhupIzYN7gtYEdUHB1NBneFY7qls+WhVUqCexrH0xy6hW0s7tK X-Received: by 2002:a17:907:7b9e:: with SMTP id ne30mr1017785ejc.24.1640143823676; Tue, 21 Dec 2021 19:30:23 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n14si134988edx.394.2021.12.21.19.30.22; Tue, 21 Dec 2021 19:30:23 -0800 (PST) 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=p9b5gqlR; 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 AFAB068AFD9; Wed, 22 Dec 2021 05:30:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068044.outbound.protection.outlook.com [40.92.68.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DCF568A7A9 for ; Wed, 22 Dec 2021 05:30:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k7oFaWpjPBFhsfhsjHx1rY+24+NS2LhNm/GApbtqi6rN9LUTwUb7wekAK9EEMPdFuzAFCz3kTxjGXtcwfZbB/u/U0/3/CBUM22qF4G7MnImt2CqIxu4XzQ1Od5vrxv1EOySrpNkVj6ZOB1DpC51FhRqQkgPXrzbwV3iwCE4zVCCQHWw1ZAZKaO/WcEYe9hiMMJx5ab4eG1NMPK+FAqP0muklAabm98sZ8rpUsKwpB2ArwNViTHoHscKGtu1C/lT9Z2yQw7ESQbQD12wUHcn/DrBGQKiPa6vZfMYj1RQrye88/M+maWYiduoPu+me6S6tEx1NdWsTTHIatN97rMarnA== 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=xKu3IOKLLp0e38djmR8zuGdkQGH28f5mlokugwRLiQ8=; b=K/E+VDWEyasn/3LQq9g25QQpFFQoHwkJhlAheL1uiV6/Fbd0ysOUdsoYqNY/QgK1LrlcaFUcwojtAOPlueOBesuCg636MsUk5ISHdUdW75va2va9rhPDWXIKx99v9goVIH30TGQBP5PoBoaNqEXBGfNMh0fD3vVlb0dxuAKYvwCf5FuV2mcACMZlo08CuXibACUlNw8Es1sowDQ0A22OMbLYnym5IhT3zF7jUzvpl7Afb2odS8brZFyFZA3I0k6LVgC0Iw9Ku4ocb+IPTb7yCs3ks8oixS/GWDaDHUz1UzFGofZ38cGyj1rAmZCmJCZLjH9HkbCaQfyWBPsBzX+NaQ== 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=xKu3IOKLLp0e38djmR8zuGdkQGH28f5mlokugwRLiQ8=; b=p9b5gqlR7XqmsIh2K4Vo5CG/4oZ9yGMgWmiYTEo/GEYfP34eu7cDQXvyAqRhIPfz0QxIMIHFHJVxiHO2V2HrWCX4GliwaOJyU0jCegSswyjxNixpmZaoDldKcXHm4wZUfFzOpAecxDktumVIHAWappv431i/vupQySh34/yYRuGNm/HDAFJE1Nv3JNZyD251hU6B8ep4LrCXKLxyX2IiKpqAGgUnb+fzzcr/IyBcsNTewfuSEkWsDHEwkYSADjv11nxqYSW/LC1Q1H6S1yBSIRljI0xI39zPEaB+sT7CLwSY3eIR9j1YEpBpOer2idh8cbYMCX3g2Uw1IzbqLfQYpw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7159.eurprd03.prod.outlook.com (2603:10a6:20b:2ea::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Wed, 22 Dec 2021 03:30:11 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4801.022; Wed, 22 Dec 2021 03:30:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Dec 2021 04:30:02 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [FrEkt3r8JYRd2XubgUs2V0xgbYYprMh2] X-ClientProxiedBy: AM0PR06CA0085.eurprd06.prod.outlook.com (2603:10a6:208:fa::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211222033003.898353-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6fa39a3a-c7f3-4dd6-f963-08d9c4fb5c0c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JLW3JzCk1VgEeinm/sEhvz0Qq0YolhuWPn3B5VNwQDx9dcRtd/gtSLNe2jPKNcW9lhE/uECqhJFwbs9wGDR5o03H1iL3Pjpmv0ttk7Uu6HhZx8Z+pV92EgQHTE7Q8HRAAihvmsToudt9LiP3JE0/gtJIxFjqhK0qVVmZ0qtQuK3bPwScWgOuhqrYROQAfmFbFfObhzxLl9zcODyxWl0MMB/JP++jJZ3NGcTS32rbwYT06iKRjZAMIpdWkO7/jy4M+1cT49bJJMDGsv7rmL4B/DNnIR9GsEnLjfn4jqdfKF29q/J4LQkLz+3zDWAfsKIiOUMrj1+HYy3ekJxaS4dNZxbRrI85U8E/sO+8boVPBtkqkHEH5pf2FexG1oYH3/kUg/4eqNWODgbAVBmrihwTeI5zVx1/fiUqphBWAlpnhQr38+ymQL9HgxMdStedJxDom6UG0O9i7v5taJdH2Qc2m14/3fQQhydrn3kwb8aaRF0RXjqYRQxiaHpu9KzwRd5Td9lE5wWIDg4/uSTx1w0pceuhlIx4gmrSPC6gX9xlyKswyHxruI9Ebww995LqRDZBBuvQarzd7BRB+7JhSQ6WA6EbS2BPJSyCtQ7QVHtnvBiSIoxv6C4ELZ1Sac7hZP/XknpfIZLXw/dnk8SUPMS2J1inLaamntxJ6gx9ZHf/kaW6FY44ip+9FQSbD+yqmQv8W6sdsCoWFK028jmgtmTClP3bDEdIEFE69gjxaRKbVLa0= X-MS-TrafficTypeDiagnostic: AS8PR03MB7159:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fRgQz30MQZDGUrPUCLWR7bEZMwi8tmx4I5yGyCanPTbgVoGBqSZvu4ZCVES5YzHq8GvzNDDJi1zQ0cPVm5GfbfWvh8QQTooBhDWCAVX3FiAJ4HBmqzofrEcI6pSs7z1ejByFVSeLSRsYCh5JeDe1UZc84aJ539uplWVx+SVa6K/GK5SuDlIXRWtrOC7ijvxTbce9o+/WJBbyHy/mZpnwsPwLDZVk4Eyh5ovHhUq4AI+wLHH4NIKjHtM2FLX/ekbcJycLZVjG4so3xiDHlVI5EbzBSVoVVJON5is/oA25igiWLyuinfW24i4I6JYy3151ISaONMnRYiyrIrO5r2EdJmHIx6JKvfhV/NVhuCuWu0F2weqqLanW5Nlgqu7MiOv+avIc57wmZw+446I9YUcMgYFP1Tuw0XNngqKxoFEWffgzE0KMLuxc/m5EwPSnTmXCR9AbjgfzgKUlv6PmUB5MAqp3AWa5WpK5IJdtNBPwnqgsKry7bKqSFcwu+GLYoVocqy4B09CtwWGjx6WP/bTQEPtR75IXuaMkg9woxEJhUgnHhOLew1y68zM+aBJJ5WZgyD5TMVV7vr6M+gZVNT00nA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k+bddIYtm/Jh7Xk5uiSuVgGU2tfEw0wK3uXk2k95fcg788EpXDyFEzDHWrd587TFtCXI/qvpqfqH4bETZKmDK/0NjEtmces9F6J98CtGyQN99bropYaEj8Av+NNGgZgm8jCp5K7CsDxRrlEVeJmLxzrW93PtCMLtauDKwOQTTGhH9EChxxKXyi+klb9GnF+LNSbyEig67xlqhICiU/uxch3m23B/6F7Sym/3daT4KON8KkHn1zIoUKDMMMHiyv85c14rtd5QsQJQVF6333yl9uCv6vdb7GZ0MkUdTBuQKpfkFa2EPS0J9MZXIfB+LRefO7edFUBr0BNRvKvujSus+kBD4TthCfq52ftqgJ/9MQTkzMuK/W78823v+YaefRDBq/HwFTcVbLRLsPIlkj7BRRDCA4UJ49Us84nqEuN1K0nZl2hIAOBAwuorw093MBn8LtYZBnl82fsX5w+G4UN/GLnUbgEoeeCRfOXwjZ+bmh0dMctkTpASSX6J/ZDZUnHL30VmWh5Bln7YRuoLUPypNizjtt20ACvi20fZX70/H2ib4dYqsKKMJybbvLteQZt8DkoiF63DJrSwpGhZhXjaWY4Q2k9zwdGwxJc79uNh8W5MAA33rrNQIDWaqZppgAR2zA0NbJBFj0yX51giG/6d7jxzBo5n9LaREX0UauVpySU8cj5CBbdh0DI9+G7ADXQye+Oki2G1yHO6+LUc2Ux6CXP/8JIi7uOVwBWmYPESHbqQTZaiE9ndUyUYM7Xp7rHaRtiFdFxdTBHbt+T+zmnceUSizNKtx9oc0O7LOL92GVqCEXpaeFiQGKGYpnDFjKAIzsyqoG5680ni9ykuw7DA3yJrtHsU3yjxpFovpO6B+UC160pfDDb/Hs6qi4XgaToBkuPOKlqu0G1tdzDOAV9deaLZsaMZ/joUf2NEs+O45bZbewz4Ta4tM/1Ni9VAVRf1JrjCbbRI+d6gaFixTMXXcA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6fa39a3a-c7f3-4dd6-f963-08d9c4fb5c0c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2021 03:30:11.2012 (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: AS8PR03MB7159 Subject: [FFmpeg-devel] [PATCH 13/14] avcodec/mpegvideo: Remove unnecessary headers 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: vLR0T8ydrqBc Signed-off-by: Andreas Rheinhardt --- libavcodec/eatqi.c | 1 + libavcodec/mdec.c | 1 + libavcodec/mpegvideo.c | 3 --- libavcodec/mpegvideo.h | 3 +-- libavcodec/mpegvideo_enc.c | 1 + libavcodec/mpegvideo_parser.c | 1 + libavcodec/speedhqenc.c | 1 + 7 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 9beab58a83..8f502b3c56 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -37,6 +37,7 @@ #include "idctdsp.h" #include "internal.h" #include "mpeg12.h" +#include "mpeg12data.h" typedef struct TqiContext { AVCodecContext *avctx; diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 39efed69b1..007e7fada8 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -34,6 +34,7 @@ #include "bswapdsp.h" #include "idctdsp.h" #include "mpeg12.h" +#include "mpeg12data.h" #include "thread.h" typedef struct MDECContext { diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 46e56ca08e..43f27514b0 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -31,7 +31,6 @@ #include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" -#include "libavutil/motion_vector.h" #include "libavutil/video_enc_params.h" #include "avcodec.h" @@ -44,8 +43,6 @@ #include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideodata.h" -#include "mjpegenc.h" -#include "msmpeg4.h" #include "qpeldsp.h" #include "thread.h" #include "wmv2.h" diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 942b05ba37..d810f900f2 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -53,9 +53,8 @@ #include "parser.h" #endif #include "mpegutils.h" -#include "mpeg12data.h" #include "qpeldsp.h" -#include "thread.h" +#include "rl.h" #include "videodsp.h" #include "libavutil/opt.h" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 9807e491e5..4ee7666c78 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -45,6 +45,7 @@ #include "encode.h" #include "idctdsp.h" #include "mpeg12.h" +#include "mpeg12data.h" #include "mpegvideo.h" #include "mpegvideodata.h" #include "h261.h" diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index 39b9f2e43a..c5dc867d24 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -22,6 +22,7 @@ #include "parser.h" #include "mpeg12.h" +#include "mpeg12data.h" #include "internal.h" struct MpvParseContext { diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index 4a2b422f13..8f8b791164 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -32,6 +32,7 @@ #include "avcodec.h" #include "mpeg12.h" +#include "mpeg12data.h" #include "mpegvideo.h" #include "speedhqenc.h"