From patchwork Wed Jan 5 21:56:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33106 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1111911iog; Wed, 5 Jan 2022 13:57:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJx8HkBjnUVRVTBmVirHo0IV80Ivx9zPtt3cL8X2k2DIVepyw6jajVbQDcZ4rm727ewlb48v X-Received: by 2002:a05:6402:354d:: with SMTP id f13mr47219440edd.135.1641419841886; Wed, 05 Jan 2022 13:57:21 -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 cm25si77003edb.304.2022.01.05.13.57.21; Wed, 05 Jan 2022 13:57:21 -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=ucl4vBl1; 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 05DF768AE56; Wed, 5 Jan 2022 23:56:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075019.outbound.protection.outlook.com [40.92.75.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7E0668AE25 for ; Wed, 5 Jan 2022 23:56:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=odL+v97bcpqcck2Eug+hdcq1sR/OUvQ2x4BcjMLQDdvhwbXeF54rrN03UyHsepdHlhDe0PtWsEAXOvVlbW49hSCSKCdCiKFFiZMVNQTQE3vS+4rYZyGF/YZZul3g35N4zw3JDdAlyKacPLYgeA0a7mXgCACFfCcGwjPErsGxkkGdiVU8heUbis93JjHbs9mS3M03WklUWtEeCxUXDdUNdBoxO19lrfuHY4Q1QZIbO+a9PXqdCrvHHAeW5QFu0PC0rFfrqYvObZe1XlMg+RotWioXe+6uDWWu3lYkwea95OUd5Ldww7hrzSnBpS66aWFrV6F6Nuz6dK4Owi/RSzJKiA== 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=VJF3D5r/6udE/SkmWUpGqAlt+kGbpuEOgs8QhO25bTU=; b=lOw6md8z2Y/TfgZjvM7E9JMUZ3siw0UklqQe/Wjvtd8zd0Dj/5hzI9ZXHTEyCPzN6bBVxtK2MRyP1CVTQe6arg/THPFHeiF9vUIaOeZBzHFBHZm/1jzrUnr6A8XCYE0ctF0Ox9SThlsZkbzbDr0KNEsiOPehTY+wDNZHaHy5rNn53znEQXdLTb9MHMAGVxUYrICKY7EYTEJcvFbpavl8orXKSrCd6jjUY5/qHiQskT87UppY4xUfcCTvXdQPnIAy6BF8lwHpxC1fHVAx+rDSC4ld4ARYLrY+BUj/BTlzBbuxkUCrxi4O1f16C5pkPZCwtqbANBFvX8T/OX4+1maSVw== 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=VJF3D5r/6udE/SkmWUpGqAlt+kGbpuEOgs8QhO25bTU=; b=ucl4vBl1EvbM8b4y0SebkNq6URG5MaA4aeA58av0lrCHSA4u3hkq5sm2gPbp0ZaGu4rbXBG4KKea2BySm3sjuGQlb6TFvUZCJ4RZCmj7wjbjIqoPfw7vLGxZldxQZhDaFIlo8IHjpcK6MK5PDNsxJ8DCtQInsqdIsJ21e9Dl9ZWoVRs1DOlA0B3j0UUuJs0vUZdtOSVLD9t34/ag9htIdMrWi5h6DlUYWNyzDPLLV9vsHhIF0qFZjDAnqPztj4i/7oNOgkYe9mcbQoz8gnDfLTvq8TtuTBV52ErNlCPXEn88v3HQ7UDp6W0c64kbzxp1cxJmg2EaJeQNOqdkM4oOcA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6450.eurprd03.prod.outlook.com (2603:10a6:20b:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Wed, 5 Jan 2022 21:56:29 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Wed, 5 Jan 2022 21:56:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:56:09 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [e03NB9DgQ9QwJ9RsmUhz/xgJOBVHTjTn] X-ClientProxiedBy: AM0PR02CA0183.eurprd02.prod.outlook.com (2603:10a6:20b:28e::20) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105215610.813119-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1522baac-0c13-4604-58ff-08d9d0963a0a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JSwKuUqsywmCCBQA99muuERo4vHXASSYN34VVyuuwuplUi+ICCXKwYcrOkhDne1cnrtTdiHK0lfmUtbMcuk0hpm4vVqa7U2MMbHbL2twiSFb9zUPoJkHWkUr7HceluqVdgLI6sywnK79oCSmD22guHnOv9EKKlm4tRc6qdD0ZvX78jLueQxiVLua0zaFVT5C30D97paAJ8lDEvxlKC9EJb4dYS6QzeJKgBwcduSlfYwvMDmHWh47AdGRx6M4u9Dals7q23bHCRgB+YddIAeLyptUFOLPmPsCSW/zGMomVrCgivs/v/kTHrLkVtTYe4MswZpwZaTp+GGMvl2u6nGyYAGRC8bXdJxVBc4wVo1yds5N+iMSUN3NnJqHI9yLF7KZBG8VwdQd85xkBB/bsiCtC/UlBREjK4wKvuU5SGXOcgnrC28t1GexlhUrk/q+a7GdMag/HNTkSc4AJ3Uznp29xfR/SdXTL/X1SakekC7X+oAfEwotKIQ9uY+5OHat9mM5Rbo1PTexL/DVYzZPGQnUcFZREgaNMLXB8UIXM9YsQjXFM/qPLMCAICleti4GYY+KKMhZndD0l/RzygjSqNbRPmjbjnDgssjqrt25EN7JJA3x3A66G0CJGCpPqKIK1p32FHdMRrRR/OEN8fOM2waRAUCF37hcLqV1RiVI2nERkgGn0APIFiAGEWvpQkUjeeLbD1IUUUM9ED2Dcf+71z0egwdh5U2Nuc2y6hfMpdmivGmc= X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tpLN5S/cBax2hi/ujVg3GD0WFWl4jF7gpLBPFJ6eK2lpVqOWT41bT2U/3LujyjGfNUFBv0dJzJopsNRz92oai57/EZ6HXQHnAygtI1eMO13RFNDPGubtwg/LDxX7oMSYQHwKigzjgBpg5cWwLd1NtFsWZB9x6MZgDC1R2ovXo5GaEVbFDSlr+lB2cyGXorfUjas1jQTMX4MfvRhFBivDO5LniepYNJ1u5VeLJej2N30/oDyVZ+xPoVhyJ1phGFUqBk7nkGc5GXb+nA8rARGdWz3JoM1RRmz6nFKceEmcJveI+BzqDIpDeCYjBdVHWs1fVxnaim+6IFTQYqq11xQW9hHS8+UHnsgAtUyg9etYtnBtpYMhGQBrPrIzVVh/XV6V56alIZ79opSpj1yg/WS04Ft7l1lBFnuBOCF1ca3fDh06aqoZAy0X+fy3yTReKml1uYeaChOxfVJcfchxetItgkTPT0abf6ltZ63VjaggLk84IGc073zyst4WYYkcUiUmZbEx9buX/uUcq4wCPCHmN6YJnfBvUMEaPKL/ph3joJg/A/p5iIyWrrMxA+fDW19Ri+zWQPelW0khRZaGr5ge0Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZP9ej+5+eh/ef4Yo5FkcoxGTM/GJR2iFpenoISow6FTya7ekzNIGSZdZTryYo6qUgajqSTb6ZM/a/0xvGwwGDi2jugzrKyB0umJ67AkC6TprYWmkg27EE4yOXeacjEwnxaPTT3duv2kSi3wSO0s59PhbAhtdRMyivdWpT7WHhCqbYi+nuh3ppiE4Dr1f7dU0hKGW3c50WDq2bTPqfsWnmTrLxYvBEj3CEY9C2gaaTAIQfNSINd+ahz85f48mFHV2yPLEhWrNbqf0MgGAihCiuCHpp5xIL2iV9WRw1jRUlAkKk+Isjms5JLFcqLgltZDWhTSN7ICh2nyp+pNwQ5Agct7JDcyqkDzI3k6HrTyUJM+Q9bC18xIu6BFk5NdV2Ly2BIhw021ON8aXjmeiSjFxKpI02ALA2skQ/otSys66o7wpoNkk0Wo7X0t/S/HH7nfgdD0Kg6GnTHVqNvz0vp1l8eeiljD7wK0dE+nROt/kwpFwwII14AetAp3nC3+7NnBj0CrJ0hWxe5wZuAoJfqN5rPfC91lVhj9deMLbQbn9KfWmuLvgEeUKnuIMqFEekErEyRKbu0j261MRxr8+uHVZbMFCby4Ih328QWf4/I2TfDHm56HULXesdDoCgeGi0RTEHC5z6dLu5jKwcCOWrGq4nmF3pqYh0U6h6J+jCr5RdXqzMCUZXvpNzXfUApYFAQehJQHw+X66bzx7QK8MwBNu8pHrt5luC3DaNBjjjs2yc4lAMzg+1BgjfIEbZcYCFeVPaU6QOUOTLISDa3zwq0DogqGU/MgCzbRQIzJIrG5YIfZkAMfexSRzb+XWXNG3iNjq7jGCDBtR824lyfT60i+oRJYnRMuLCkKu5y/q+0oI9iNNLA04jCVRMzWd1QP+gaGMp7XocyPXYg7BuRozvD6ZNz566G03McIWkGFWRa+l7jXszssh5Gq5DkYyyUPwr+RNYrY1n3cc3MoMyA1bpn6WSQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1522baac-0c13-4604-58ff-08d9d0963a0a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 21:56:28.9407 (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: AM7PR03MB6450 Subject: [FFmpeg-devel] [PATCH 09/10] avcodec: Remove unnecessary h263.h inclusions 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: vrWVaGVa3fRU Signed-off-by: Andreas Rheinhardt --- libavcodec/flvenc.c | 1 - libavcodec/h261dec.c | 1 - libavcodec/h261enc.c | 1 - libavcodec/msmpeg4.c | 1 - libavcodec/msmpeg4data.c | 2 +- libavcodec/snow.c | 1 - libavcodec/snowdec.c | 2 -- libavcodec/svq1dec.c | 2 +- 8 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index 614ef20243..158b399c40 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -19,7 +19,6 @@ */ #include "flv.h" -#include "h263.h" #include "h263data.h" #include "mpegvideo.h" #include "mpegvideodata.h" diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 80ec1c8814..2fd8d94df1 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -31,7 +31,6 @@ #include "mpeg_er.h" #include "mpegutils.h" #include "mpegvideo.h" -#include "h263.h" #include "h261.h" #include "internal.h" diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 79f680f81d..af65c1f3b1 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -31,7 +31,6 @@ #include "avcodec.h" #include "mpegutils.h" #include "mpegvideo.h" -#include "h263.h" #include "h261.h" #include "mpegvideodata.h" diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 16b6f18950..e76aec6dfc 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -34,7 +34,6 @@ #include "mpegvideo.h" #include "msmpeg4.h" #include "libavutil/x86/asm.h" -#include "h263.h" #include "mpeg4video.h" #include "msmpeg4data.h" #include "mpegvideodata.h" diff --git a/libavcodec/msmpeg4data.c b/libavcodec/msmpeg4data.c index 890aeb5670..a3a8144664 100644 --- a/libavcodec/msmpeg4data.c +++ b/libavcodec/msmpeg4data.c @@ -27,7 +27,7 @@ * MSMPEG4 data tables. */ -#include "h263.h" +#include "h263data.h" #include "mpeg4video.h" #include "msmpeg4data.h" diff --git a/libavcodec/snow.c b/libavcodec/snow.c index e0fb58042c..0a500695ce 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -31,7 +31,6 @@ #include "rangecoder.h" #include "mathops.h" -#include "h263.h" void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index cd2265aba1..d54036e02b 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -29,8 +29,6 @@ #include "rangecoder.h" #include "mathops.h" -#include "h263.h" - static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, IDWTELEM * old_buffer, int plane_index, int add, int mb_y){ Plane *p= &s->plane[plane_index]; const int mb_w= s->b_width << s->block_max_depth; diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index a67d1866b6..a2b3f71c07 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -37,7 +37,7 @@ #include "avcodec.h" #include "get_bits.h" -#include "h263.h" +#include "h263data.h" #include "hpeldsp.h" #include "internal.h" #include "mathops.h"