From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8D0A04A833 for ; Sat, 11 May 2024 20:59:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BCC8668D7D3; Sat, 11 May 2024 23:55:03 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2084.outbound.protection.outlook.com [40.92.90.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CE9668D77C for ; Sat, 11 May 2024 23:54:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HxOUcWCoYgDursIioXbwGGIJwR9OgoYfoxbVrtpcirq3kIz6lx37ZxDSbAkmrSWFcINFnXZ2wye/C7PKj0/eYsFfKUozLQ2oC7pzcYdSyU6Uisn83d9LqxX/P3fwXpJ2v574gj4NvyQJelHqH0rQ72+4cP3qIYKX2rRGhmWg8LDjYXhpJINXRXaEQpp0tdFRpt6FWFmrYuKpFLJV5OvjDTGS29UL0QJwYpneLrODlenqABIQsp6tzso8/9ttt8UmZLK1D/HApTaM+9ztJ/YaTC+QsuPo+CPQiQ7zyxNSwGFGq16q3UO3l2Q8tm5untDBpaBPtxAfdPDnKwk8IgbvYg== 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=GwC2XrHxrw78HO/VygTdaHC6Avqh8iBKIq6WMdJhcmI=; b=cR7v7Xe/EyETOp2Sm9xGq5F2j2Typc2JwRvcsRjcdXEdxhiJlrc0PC0Mo478kRDTPlQsQpMkUm0iK1eIY1fRYXdbn6Xpks0YksDa3FAG5BK2X4d1mIqv93iAn/YTktcbOgb3Ju1kAx8pVEvmcqG0bmkL50IZkdc2l/jcGmp9HIyEvfX12UU1R87FH0LNokB0H89awFB8hGlnRq4u/yTI5H6FYdQ5rVESTr3f8IRirQN/dyaPpFMV0eBF/4TBB4XSFYNTPsDkNFZSqndIfmZxnelzeypwRLatdvEfyhbHRll1HfBjiR5UfhAXnfYgen6yV7Hc78sCEi3CZLtxa92Hog== 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=GwC2XrHxrw78HO/VygTdaHC6Avqh8iBKIq6WMdJhcmI=; b=OI6KOfNrBPEKUbAklMhX/uOmESR/1vVOkIqBiDQn5OIaYooZSQiRrcGZNGdLkadIsVRCLXcUOfOeswpJcPaVFzUJLLDn39DM1OM3btjDVwXWLS85PLKSTLULsBQfDwXIsqrCAvG9T0+4R7Y5NUlAHX4ZPFuovtjN2mqs1G0hd4A3b9Ah7U6Vn6Z9osi7ctKQm0SfWrpfWcdHQJZzWfXrOgKlUTcgYKos6+9RqlbeEc79caIbWu/JqywLwv75TlPS4R3tLR9ep6IiCgM9wN4/DRhtMzZ9nd623jHnnOqR1SGwFqH36S3ITdAZgwFnDPxPFsiiIUdtBvyNG2y5Yi7tQg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0070.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:54:56 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:54:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:16 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [7S7bIzPlYvmuL4pxn8CBHQweZy1BF9kP9HOovR8dlGE=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-51-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0070:EE_ X-MS-Office365-Filtering-Correlation-Id: fe9b77d6-aa22-418b-bdd0-08dc71fc9cf2 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: Y/o0vdznsoTNeaNwMr+0IiDEW46S7qd+Y6g3GJiTHaKyH+A1PCUTR9IRXdIrJFi0bd/6l8Fxd+0BI7FtCapdl/pIJvuuQLGvcA+Hr9dMrVMmup4s9xRkUGskIK8MO1Vx2Fsiiw2mxcsIO3XJR6vZuG3gyDDP1f77FQQt209OxspNmynPYKzfboOsvn+UFIbC4M30iSuwreWa0yatS8mMCnXAVLkfI841wyma5Dox361RcWoPj4yUh9DCXE6lxPwsiUUgXIS4gTsHfOYNAfTqb79S/0anLMzaEVWDKBuMgpBtjMQOrQOobc7u1ZsxEH4JcRp2OE1nwoknDnmTPYEB1ILDdI4IF093jZ4TjUhWKH/E+L6h77UJ05Uf/35NwVq3V43PAitPDlNe692JRee+iWKo6MTPhkDSzQ4is3aHBgbYgFPEK538lui0H9hxlt9bhWOtCrf3ISZohvB5OeSirUJkDYjEKzRymWeMUUyeqqtuRG03eGtKX0QpRifmiH0d5SwkzhvDt2HXlF5e3tEFYGtmb4ovdpVmgWDF8F+2b00NU0zWRlW1arc8ZyAZmip1sA2QtHw8msmW2DgCCHHXNxJ0N06Mkjw0CU27Sst1EuaPTKCLU5El8vy95u8xiOPz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FOdIpU36opg2Pf8hMrNl4EDBTrVQ3kxQHtjum2w7fXnpn/xb4/sW/AYLePoZ?= =?us-ascii?Q?x3gurb38tJDv1kvyb0ZV42ZPPZr3CHJ1MFEv8PEHEMC2Z3DTbVgAs3qb+3sw?= =?us-ascii?Q?enOyT9ntvXA/pLz+TqXg4VhlQpNiBbzvyfFLgvgsAO+tIaSZLOXJ2kDoYsFS?= =?us-ascii?Q?H39twzMNavOC1F2W5G7hX+YneciG2aa/xNCFfTXZN0xu3klknHLuasZ2aKIm?= =?us-ascii?Q?dEJtkaNYDo29WlKhmF8/yuuQXluS9gqTDR4O4JVTXg9cgjopJAQanZWiJQK3?= =?us-ascii?Q?yBU0zvh0AXbJjgW5XJn5kT509/FLA0WSjFRJGPWwqciTTYQu2uR6up8e6+xE?= =?us-ascii?Q?0WILTUBLau+AsmO3TIoLUXjbz8TnvcWT3EaV41vPlgQAMA22NlIFp9olY755?= =?us-ascii?Q?36SbgVV8HS8ZCMAcvoGm+R3CD67EVqCydM1Vs9tLtL+njJ6sLWvG3P01U1Ny?= =?us-ascii?Q?SbjjBiipR/esenOnFLblYpGtvlduHRzJRmtjFVRidx9cDSaloPgMQQ8vqN0j?= =?us-ascii?Q?n0VwNj0Fw+/QQwo+n0ObyJk+PiyN+XBfeRMUsuS9DCMPxk/RCUlx794sE0xa?= =?us-ascii?Q?rUXPSI1s3i1ug0ZUP9nLljnu6KrY/sHRbtEmk1yYPvNl4FcDa2/bg4gfxtb3?= =?us-ascii?Q?HSwErihWWEinwvEL4TkQV8QEJFbS7NTzIsYIUfi4qPqx53aeXQWAVpK/igd7?= =?us-ascii?Q?ypDch1KOGH1EjrBH7SlrGLJ9VFkzf1stRwkIqDzZhTiNAog9Wnvrd3a6J6Hi?= =?us-ascii?Q?BEp7O6QiIiWSWHwOUQRlkHEMOxIf8wJZsX2o1kjhlXTu99zm+mxdb9edhHdt?= =?us-ascii?Q?A6D1fEL8pj5bEr49BmcbF89krYd8mDsU5BWZhxcvHEfkuCL/ebwcKs1Y/eY6?= =?us-ascii?Q?4h80qmCL4/oMp7fVE47uD3xzcgPQlFpx7P8mSXIsirTGgLtcwQOYrR3B6bGi?= =?us-ascii?Q?MsjIqeAfVFuyagiseUxNEtbYTdJO9bu9ts+i2FZbq4hbtmkQzwVYBlurY487?= =?us-ascii?Q?MBkVIlW0qVTTwE1GX9Nyg+HT2RJY+Un3FuJUl5WVJFv3MKGdRC1C03Itub01?= =?us-ascii?Q?jhsZ3sA84Jzh8K0NCj7K/jpAvwiuJCP//9FMNY4c9OIiGXllUNzE4/lNA516?= =?us-ascii?Q?YrYOZLZdkAtulnOdWTk0t0EbwTdfnducD7uriZ+GX8i9prjSYBqF9gPSGKCb?= =?us-ascii?Q?saxqwj3RGmEWNPA9uXV2HzmVB0jHXyxwtsgGMt1Ngo/xM7Gz6ZDFGgEH4YdD?= =?us-ascii?Q?8JemTbshnSR9InzD6q0rjYAqD/xNhmsFsgVRCTrZuA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe9b77d6-aa22-418b-bdd0-08dc71fc9cf2 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:54:56.1369 (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: AS8P250MB0070 Subject: [FFmpeg-devel] [PATCH v2 52/71] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 306dc3b47a..ca81b4837a 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) }, -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".