From patchwork Sun Oct 16 20:46:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38750 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1306388pzb; Sun, 16 Oct 2022 13:47:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4NYbOIh4er3COMYWne1+sgWDEBgNZ1LAMHucmAW4A1cFQ5SxCtsrAo2jKuEhCBrFS7/qoe X-Received: by 2002:a05:6402:3215:b0:45c:97de:b438 with SMTP id g21-20020a056402321500b0045c97deb438mr7456776eda.7.1665953256175; Sun, 16 Oct 2022 13:47:36 -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 ht10-20020a170907608a00b0077fb99b8cfcsi7543300ejc.301.2022.10.16.13.47.35; Sun, 16 Oct 2022 13:47:36 -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=QXF3U9f3; 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 C465A68BCA2; Sun, 16 Oct 2022 23:47:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075074.outbound.protection.outlook.com [40.92.75.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2984568BC73 for ; Sun, 16 Oct 2022 23:47:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OyNFbcsZ4iMyqcQgiRWwrWUJ49oNtA0YW9CiBQXXe2ntL01VyD5ZfWT4q1/VytObsabA/3myK5W4kSj6sEHsX/cEGDojBGssHsQ7w6jmvqQMIZHku7L8/EUXkP08aHMZK35X4a9qMkOaQ1tOMWJB/I4wCbB9FDJD0a745B+4wSceaLwfsDy3tOjZkOckHvQO1W7/FVl016A10QemaA07bB7j90WzhAuUM5BQn4hyhPTS9IKO/wJ+o9aq2ESrCPf65BZtj6iA/I6QYwNIaD0xbxAijRUB96Y5T8+rZ8c0dxZ3MTuMNWQvkT0OkcimDD5Z+wLIcJE3wmcv8eiDhmFwcA== 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=7ROdl3W8ervAKhFWo0WHE/wTNxrw8pOsIo/JUg01JYQ=; b=Qci2Jh74nhheIRjtj8ogIBhE2qsjsmpREoMhA3DwcgEjVWa07SKRDLDVRAx/bx9p6IieViCZlmGgG3BGEhHx4elcewYFfeNbU/ULw9ArgEJxIzcEhjJoKf1RlBPoaZLzKxVprm08kBy2+aJiCy9PcZIvOOl/O/aPqJomw5KofvhkpKPGNsa4lV8SDscbVkXM9W8PsnIbMLTbJJwEO27OHKVfHWKAYaYOLN2J4pMkdIAktClg6weY61N+Vyu+XvnnDDm/6fKbnJjEISbj7QoRCVdBrl5DrrbGJy+s3sJXjBA/4d187l42p7pON7xBuHinrw2A+dRjg+F4OsHFCVnCEA== 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=7ROdl3W8ervAKhFWo0WHE/wTNxrw8pOsIo/JUg01JYQ=; b=QXF3U9f3V3kfhFXI49PAXBcADcLxV8YkgWKGONw9rTOx1+FyGlrgI/DNuH9g1QMw3gpRsQ4NL7pZXiqAHadLZeqHFz8cD4PuEuOxF/ecdPloP7CzpnN8y7JFUhWBE48c1QcLcBZI+HBHKxnRc/WTTikGkhXopfjO7kUfEEOJkCiJURIXhOCXmtTMRcidc5brcyAge6C/jcSDUSYTarjZgB6CxphfCiKaIM/tiY1rtiAhKMfpUPLpIBjo5z58eRu1iB/sGzbLfNnmaM9v6CguMq0s1XbEK8a5OBXkIbVdxsCD1RlT5ZcpbPHEVr5wbiNeXDHfCjPb1aXVTQf+wLIAaQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0090.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Sun, 16 Oct 2022 20:46:57 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::20c0:9c9e:87f:79f]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::20c0:9c9e:87f:79f%2]) with mapi id 15.20.5723.033; Sun, 16 Oct 2022 20:46:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Oct 2022 22:46:52 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [tycLFOmImUQDQ4RVuGKxnodhoUjaoP4WJocmTIpZ7a8=] X-ClientProxiedBy: AM6PR08CA0035.eurprd08.prod.outlook.com (2603:10a6:20b:c0::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221016204655.605202-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0090:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e2f0251-04ca-44f8-fabb-08daafb790fa X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmriMkceEMr8g+y2B+GCHAesFoaKGDW5wEMDBAQEfAM36Vg02a/sMN3qvc5jIQgkHdw5r9oVubiXvucjBQBWGNdzPcFWRfDxlf3p4VwMkeSa/GvebREEFLPBT9mWP91Nh0HawvR36SzPJnItAr/uoerWmlxAZ9I2lHHad/6zYgyeuFC4tgQ5JvxZmxOwdMLNlX5cCO3UCpnt7f/5cE/7rWurCN8FkeCrGcY/4RuR5k5LKL4RlzXBVE0solMu85CC5aEq8CgmvS8VM45eE16WNipqn1kg27ykkElAVgCzQbUsQTTkaUa+jcVpWodewjQ58+2W9QwBVy+4EWDSwDv3IL+gId1ToRKL+4fNbidVS7LC32+WiDTn+sIAFLx2rRyS26w4vzb59PnKYbBr3H6BCud7bOuifZ7fUCb6RQdCdW76DeD4bO6Fr7WW62Q8J8LpH7Yq/qDUZ2pB6EcRQtk6QMUBW2p2BwsDBl0SBcpJ4gcVeErBG160H/beJTvbFRnnUjL0WzzDvnZbGckH5NUtq82DjPtl/3THkTulWWucbjdy1S3Tq0/DpK0aU671kIgy7aUi2d0EZcZk/IZSPXG0ZxfG88CkXnUNGMsp6OTvFYCtDLTdqU0J6DmNqVTjSzA3viz9SicMZ+BCqr5lfykrbyEA0HksgBaiS5hflXDqcxFDk/ff4pmZuhZs7teHLjJSYkbu8fh318tlrKgTcYEuOVXjTnBpsi+2bYstodVVSLd6yRWuydHpLlbKfXZzxGHZCUc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YkdjqKlCOlOqR9mNIi9zCSz3dcsNfUTPsXVfx76k8tfspD1rKi3BeCxAaiSWZnAiEAGXgFBxY389FaABHCdFN35gg0Lp4fwEd3c1Q/xX6gSZAidLjihzRFYUF991D1Zf4dOsLJXbUOcXlZrh3PQEp91lfEZ9mpzsky6vBHT/rQhTiD38lgYxN5q1EVULx1459B8MLXvZIiXWO2YgN9kttyaCeUiWKuoGgw3eH4BPCpaIodoI7OXrPTd3i86gmM4PQttHlXpkuKJylTHZkQVF58y2XA+bsxXvd3IJlRSppZ+DOFNdpmcB9jjuGOL2kIDETPH/m/8xzE1hzMYeClC7sv5vwbbpkC1n78YQHuyB0dE3qQeIScJb10cyNVTNOEDND921yn8DpMSCVW1i90tvzv3BIfriSl9zErccT0zwfJMgQzvM3dJ0nIbKkfF/m+RwYHC5AI+Py+3/+8oGNVX45YvJIlGtlMRJkZZu/dDd6gHIn6rTh5A9xyrIzn2HSkF1Bw35vOZWM1uTvVxhtTEnLoJxBCSrR0H1Qz3MOtUqcYPLbx03TwnLktMnDly4rjLFPpmDLcbRFnKyPPL0p408zlSrwdjk2BVAasV8gJxkBKgLNzCj0B1hUpf6m8Ll1/F3RkJODLLBelXk65HXtALPGPbnypCQvGplJDNU0TcWmE+UNP4xICTJ89bem/xLNySC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ER0ClrT6iGShk03uc3CHHoVZndZ7BxDIk0SniVjJORu1ACTMr5fuchRei+XFUNfgkLOLjJ6F6UeZRM5xs8O/LonLKqqD2PiPgY1cvK3mnliQA01j0aBbItcaoZHjEPltu3MyxwmAoMmY39RpwUTI6ic82omIU8PgcjNB6kaglb23PlAYB7ogIuMCRxHTpkFXvMIVG0O+6i4pMA6lIRN8n4A0BumuFWpBNLJBAGGWCCHa5i7xFu2V3cDa9B6kIvFuX2Id1NfXKeDSEujgCcVbVVq9IqpLL8uFlb6iCUzNCY3/uvv1XpsNhkS78pZE8fn2YQ3/hMSWgTjSYpdt/awEN+g9KW/XIN5efFOfJh0TBAxj0NK74KGkIIEfd3Vl5gPlPVQW9ZZVVrAqmIKO1MA88FJiAPesgXZw/G4LQny/KOGtQihcJrz14ZYfkcdWsYLht/IRTnNgtGa4qA4/nEpdUMBc3hpWZlOW1JlQ+/EFBHM6/0D70x8pJ438n1t+uzya/mbCtr3xS95qNM9FeItcODg29Wt+1LAmiAbcB/JK3AtpeWEO901C9QlzEpeJXIQvLgIuzHIU5zdxpXSxv7lszWQRULgbsfU3eettq3LESA2pB6PiiSv9OZOCEjRV/X8LL7Sir2m2C+qhNGRptNabcjWHr9ULPsdcysZ99UzN3SXWOarFPWvuJ+y01NRrNYpNp+E/cxcodCveJjsUbMc/OliFnH9GJSTaYzkxQk6s3qSYwxUmhHZ1/26bWKrK1eDqJb6bamlpa9c6v87QGLGsyC5y2Um7k3vzYBkH7XCfD6/YUJF7rzPtfHk0/VqpIg6apseRcpElufvLZUN4rOeFb9gCBpU44cjMyqUZkZkerDPYfJn26hQ3I6Mn0X6/EmVKUsdwbdGRGrmD7zYxGjLcBfPb7hiq4tjlA+6BeLSNkZJhJ7gbrTuQP+OozGfxi9yco6mp9HcBj32vb9n7GsyiYjfg3atVsUxW2pjrfmjUYUTgNOq7240pEIg+GHeB+aaulrrtMO2Hwo89/z7hvP67l6t7EQwgtsp7e3sQ8QKFgB3evq1ebhFRsnfOHvp2zhvnvpYL1KVqIl61rRp9jd4OKmyQCRDlIbupuaaGDFAgp16adwtvv6OX3ZUuB8GlmaL+e9frBSU2bp7+vP2LdGDgDX/48FWr91mywBtWb7XS5I0760oenrelZxPZS0qbcfkkZcBfOx637NRrFj2GS/3nkGRMBypIEFxKDMvMMVGPLd1z1nFKr3+RPoDb4DB+e/GNTn+FUAY5xx70y7yYG02TeKbcJrAoMjpsLc2eAByzoToNp1B1DvGeQ/HNyQ0VN8S0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e2f0251-04ca-44f8-fabb-08daafb790fa X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2022 20:46:57.4933 (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: AM8P250MB0090 Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/mpegvideo: Move VIDEO_FORMAT_* defines to mpeg12enc.c 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: lOhUtA6kBjLr Forgotten in f899e3b51bc85c45f54f7ac64abfbde6b2cd7d3d. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 6 ++++++ libavcodec/mpegvideo.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 01cfd1c1fa..c3df924b64 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -83,6 +83,12 @@ typedef struct MPEG12EncContext { int a53_cc; int seq_disp_ext; int video_format; +#define VIDEO_FORMAT_COMPONENT 0 +#define VIDEO_FORMAT_PAL 1 +#define VIDEO_FORMAT_NTSC 2 +#define VIDEO_FORMAT_SECAM 3 +#define VIDEO_FORMAT_MAC 4 +#define VIDEO_FORMAT_UNSPECIFIED 5 } MPEG12EncContext; #define A53_MAX_CC_COUNT 0x1f diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 1ddf8034aa..daaa7c95b4 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -445,12 +445,6 @@ typedef struct MpegEncContext { int brd_scale; int intra_vlc_format; int alternate_scan; -#define VIDEO_FORMAT_COMPONENT 0 -#define VIDEO_FORMAT_PAL 1 -#define VIDEO_FORMAT_NTSC 2 -#define VIDEO_FORMAT_SECAM 3 -#define VIDEO_FORMAT_MAC 4 -#define VIDEO_FORMAT_UNSPECIFIED 5 int repeat_first_field; int chroma_420_type; int chroma_format;