From patchwork Mon Apr 29 21:14:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48397 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp2272241pzb; Mon, 29 Apr 2024 14:19:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBIFtd78D1GsnIt7W97WrWCHpF6kdSpFUu4t5i59XeHOegbYneYlM/oih0SKhLz7ZtcQ/iTafA4ufI+FHI9y3cM/ge8g+d97iFXA== X-Google-Smtp-Source: AGHT+IHKuE9mjGPHZdHjx+2o6hOq0wxNt1GBkytD+C95Y7ZO5ysrIVeP8YraxHiJ1wCjQVYvx8oG X-Received: by 2002:ac2:58e4:0:b0:513:c47e:d811 with SMTP id v4-20020ac258e4000000b00513c47ed811mr223886lfo.33.1714425541874; Mon, 29 Apr 2024 14:19:01 -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 e11-20020a19690b000000b0051d03ef5b0csi2163366lfc.223.2024.04.29.14.19.01; Mon, 29 Apr 2024 14:19:01 -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=fqrEmz3W; 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 E8CC168D5B6; Tue, 30 Apr 2024 00:16:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2092.outbound.protection.outlook.com [40.92.73.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6736568D5B3 for ; Tue, 30 Apr 2024 00:16:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jHEL9hQx8KUJR/aLTMZL+gWTAxrhdtrNvwEKFl3Oqu9UNF9hgo0NPz3Fg8XVNqCaELw8GTqmm8aDU2tmjT4gvTzBmmGnTOxe8HMnEnXa2oDaM2jYmCPalJMTRJbYO+j/+WPmeCc1xb4LHXS02l4W/dFU5uf1v36AsueyTOFjmac6py+wkjaH8IVoyBfse/pzvY3JiDfIf6HeU7YHsTD7uv014Skw6fSVTfEw0GlcWltkwccT83NlIQzd7dR/ZmQhjyKTGhID2vZiNFVHPsVXWyI0XzXaEVFDboJsmKuRKX4jAeYwpaspltwYhdSoheSyigUrfx6Z+oI9MWfZYrSxHQ== 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=uhTERPYppvpzG8qRvFVd8nXj1GA4AOz4fhuIok8gQoA=; b=Gvxmp4E6Sv04fBWqjf+Tr9z/zIh2jPa+rIy2pZb8ydpJbZ8/YlR6YuFtruyjgmxZMzm8Ixiz6cxGRCm7cUDP2IG/6EQI0IYb3Vy6fgg6Pg/TtPQ4dP5aFgliwMsFYHa0m8d0Z0pZ6WsvJ3nJz/9wEhtDEYjc/xuxD/M5eF9zwiuPpet9zkEv1QEfCQbX9PV8MiGeXGV3ZxUj8SbsSY7tmes7cp+ZJTkA/HreKAtDy0OfsFxf7FxYVmA+gLcGtps4mVMEAg1VrfYNgrEY+14D5nJU8MorrsmiFFb3X2xuvx7KR4yUs0hOc2GM1Bjqc6XondtCCg3YcPS2uuSdVmx2Sw== 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=uhTERPYppvpzG8qRvFVd8nXj1GA4AOz4fhuIok8gQoA=; b=fqrEmz3W5JuzPMktydXVI2uGo8IS5ZChaeN7Z2vy+2ehMrvH9FDOGwsYF1SzKZe0p+sKwm3sHyEfoqqHGFh6ZYhrKj0TsqrCzCamKxpm1GXzGLl7NW0oE+v/NollTP5LEwBOC3pmjP7htApZ+LE184j9yoz9J0KQL+S/i3tBNOx+6AGRVkENswxmGTj62HNX3btU2ELwDkN02CXYOg+xnzQFDzxXRnFec99ckxoVEPrPngN2duccPfeA+zrYkL6wGgA7tOMpYy9U1tqeXu7Eq464fptF84aApEPiIGyzG1yQfqYL/RoOjCyJx/XG1K8ti0kvps3DumQuqNt3Oz/xgA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GVXP250MB1057.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:1b5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 21:16:25 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 21:16:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 23:14:21 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [98JZMrs9vsg2Y0NUZ6aU6xNp0yMO1oVutDCjky1LGaQ=] X-ClientProxiedBy: ZR0P278CA0199.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240429211438.3274834-26-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GVXP250MB1057:EE_ X-MS-Office365-Filtering-Correlation-Id: d1a876af-4467-45d5-e8ff-08dc6891a0b6 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 0t2AQcL6l8wpnhf3YaFqMOHIx+AsI9wBltNcLhrSFMKdidHnePo5AMT+pWuNU8PG25ULdCK//Vvr2pUIUaKxqMVjUwBldO5/ZJxB3bCKIFeXbCRFaPEgZk5PZvvit71NUYlnxPDjDpDDjeEcw0SnsUnjwYKV5bgM69vzHFsNuGqhZT+sgq6w3i+PMTu7AXS9A7tf7wHJWjBEfjTLu0Cc2xs1nvKv6atXd39HLXCW4IxWdBFM+eUH8K76B0V5rJ5ndx1j55Ily7qHzBzyIhGpijio3MuTwbgWvS1qCD/ffHU7Yy5pOESYRcUCBMn226nlAlAa/8ijT/emlFketSVHccX8JmhS1m/qWtXbQdP/3VVRe+KcEo6wZjPZpx9ssmQipU64MFay1Zto7Nah/I8/zETbZnSXVJBfvZXYWovK3ucvznSi1ThEQVv22mH05PGg++wOw4EBmeNnTR00tib2LyqEyiZs3dGO09onub7RHphxSfBnngHLkdUhwcES/UnP4AhTCMqCobTwjfh3tu9oloFaeduFTdDs6mIn1DlorpeRqzp/DFpF4EslG53AgNB4NSERg45VBcAP+XA7LYRNLnJDTf6mXdOQUO+fLAcg+LFg0xHaFstiaoQZ23RTYIrC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ArfZUQ3BSVmzJ6dIWpKpKvO+XVXcikETGaPkkckncAdL8RPjBGuK+l13Qh6uCZ7DDT8A92wlVtYA0NrDvmcdf1fhQr4yDCbQFo5H7GPY39Lpf/wVNqa9rhwO1Z+4fyEhUtLg2qvVvTeVa5mqwRFVZ5g+SZAj7xR26FYpyBuWqkzJZzksSBJSwzdQDAXgGyz5ysHD5x+COuJhKrCyAppItUOCdgCq5W2lduLH6o2TGbdI3Cbx4CfJOgxQc+8DIAI0nVoDvy+0nA7UUOqYXzGY/gSWlYGAgkOjdUA9RNwQJdA/2Fzmz0RQK8JtmkiInyx4PXMvNRwk69M0TuVKtJzDrLFVJH99QtA4tfUWbLedtprAeSjpBnlGT0zMqUfWYRtdI/SrVh1X+beUXraYd7IaE313NLcVVsiyOCgZif+4kF8P1UFJMlsElGfHM4RPlKLKFHyQ9C+9QnX5hBp9WaQB0halA0Ba6YpJmuQvBuKNsdD9UHwUc3RwuesYEIf4bo6C1J5A8OnBAbeA0vpsEpAw9sENKHLzDWC8LW2hc3LefB9p0sea43lx3l3+waZc9urauZU18TDfQhE/K/2dmhSw2WhQhUL6+9evp7cpCZy8yK+E5+iF/sVq/IEMqNuKq9MEFdrJ4T8qCGrr+VR7qbNJokaJhLHbz37sGzggo6Y9SWowD3YhtwFqxuzpcZLLcLJrp9YxYL5wmKDbd4UAghfHeotTml0bDfiQPyw2y/eQRd0fDMZ9qmYNmv6LCZGesLdEyMz0eE/Rl2fYDzFYze0gxXec3EnA2/+2roQSCbyGEW0HOqlrYlGLZstIAahLKQJN6Ngke6tVDY1SQMZFFiOXlqo7k5uepBymLLd1UQyAQAs6l8xnV8b57F4Z5Q8SEYFSMSHrdx1uucxG7LoBHKAdBpXMgLygTzlDPbUxvQhj2kra58XYh9PhrBM2oTedEVi5YfehkShTyULpCFWooik/nQab2lsqTxqRFzwEDIohK/NfQnV6tVeIB2dedjVdrtpOfHacg7uoeY/QOOXU0E66QGUGfaW31X6GUs2KKBCeSHO5ld8h/XQBaMQ6zb8y/7qJqeCxWv+ZWxS/4QblBQImc7i6O50qVID8N12e+XNof974lo7XsIGesQLgLcV+Zj01m78L3OqKaYVaKztOJG0Cvey4ZloM9pPym+X2Rng9O79xOsqwk71iW6igH09Jw/u8gWHHWM/RDN3E+8G7p8D+eNrad3Qk3SYghqOQr9MkAtzWUlBEXuX7diGqouSqwI8ka8qDTBqxglrgTxg4y6ZYKQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1a876af-4467-45d5-e8ff-08dc6891a0b6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 21:16:25.7496 (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: GVXP250MB1057 Subject: [FFmpeg-devel] [PATCH 40/57] avformat/riff: Declare VCR2 to be MPEG-2 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: zyqwBnVRl0xQ This brings it in line with mpeg12dec.c. (This entry has been added before the MPEG2VIDEO codec id existed.) Signed-off-by: Andreas Rheinhardt --- libavformat/riff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/riff.c b/libavformat/riff.c index 157976583c..bbdf7c9cc3 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -161,7 +161,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') }, { AV_CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('P', 'I', 'M', '2') }, - { AV_CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('V', 'C', 'R', '2') }, { AV_CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) }, { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) },