From patchwork Fri Aug 11 10:43:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43210 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b1b:b0:130:ccc6:6c4b with SMTP id l27csp1257941pzh; Fri, 11 Aug 2023 03:45:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0eP0LvprjsjhvxO4677bzwo2pxlbxN6AxhoBFnFVYubZM0T3a0O+CPJ88Mc5Cs3YVp0/J X-Received: by 2002:a17:907:a075:b0:99c:1ed1:65b2 with SMTP id ia21-20020a170907a07500b0099c1ed165b2mr1369560ejc.33.1691750733957; Fri, 11 Aug 2023 03:45:33 -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 rk8-20020a170907214800b00992e26642ddsi3269596ejb.251.2023.08.11.03.45.32; Fri, 11 Aug 2023 03:45:33 -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="VO/HFuLP"; 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 F177D68C3CB; Fri, 11 Aug 2023 13:45:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2030.outbound.protection.outlook.com [40.92.58.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB92868C3CB for ; Fri, 11 Aug 2023 13:45:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V+2yKWdFGU4WENB4lqWSuR37G4UxNK6zFXkZiSiN1Kx3WBTqlIS6yUGt7uwt3anR/sX5tk8t9PWswk2bECwba2G4C4BSxzahciSpl8EjLiSor1i/YcrtbDSQAg2aXQrxehieQOt6mTu7206eTZ4e5igEdVaLTqpM6YEWEG9LXe48aPt2dTxHt9TkVKYVUXseXMtD4eJWKLkgZwHlDeP1f13USjyaaAvonWwalEXBxYtiJN6Cy9CvAar5jFiM+bCqBUUG35JP68OnKTAqr7/rhcCk1rjspRJXrJvT0DTGXRPUkQyO+bGRDapmXSky3Bv0gK9FMZ1zh3HGXGwwlnR9RA== 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=+tJi90Hg5wixocUwH8rBiSr02VMQRSRppr/3qMu/BJA=; b=AS3Fbm5AMvfl5+M/Keou/qV8sXPtPcxn84zv+H0Lw7BGnv7qTN0l8r9PcVWos0mgYnyX3RgkjiyL9fCZpdVL5xP0fIxGQ/J25Rz+oeflgWsxxa6ey3D4KpxnYYTD27/0hof1rxjVuXIhQsGSlE976YaeZ1PhIQAOJ1/n47RUiqLhbvEXDcT8VPN/jXn2Qcyun2VDp3s5ceQvPijiJaNireH4I/I1shBKxZRq2ucK01tALostTEEZGkKYmqvJu3z6JkxcHPqk4k75PuU6TpsgCgsqz9EBBZ7p5W3hw/dHnriEmwJNpW/36a1EqeZ9EAtECJeBMImZQfwifx4uiEwNPw== 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=+tJi90Hg5wixocUwH8rBiSr02VMQRSRppr/3qMu/BJA=; b=VO/HFuLPsAdQOZfybulieSiE1QNJPEY0lwoJlgG88LSzwZZ4pAgPD7ZulMVft3zHrRKkpY3vKI9uLX2PShBWL2Ylz2vfTdTlk4bcvpQUtzPhnXUqPrwer61kmrm3EsJQfrFJZJZzVzcJi6Fo/o0JYDyyDZ1qZvHomCUwfI8qQRvNyDGMZBYPYookchNyub4awiQMVHvDrQr+llPDwB4F2e1WtshjFCSKjsX0lYPCtudbk46Ep0m6vDE+vPUZHwXSg9swj2Blp+1z8BVfcRPr8/7uRZ8DLvUdfV1GiENLEdgDlMfFJoP2mIRgTQVlgXDb/Zcbj9gbImtIVaXX2zzX6A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0273.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Fri, 11 Aug 2023 10:45:25 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.029; Fri, 11 Aug 2023 10:45:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Aug 2023 12:43:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [z/Mg6vrQtsZhzFazfrYVwfRqVjWTJ/ba0w3hewbZOfE=] X-ClientProxiedBy: ZR2P278CA0021.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230811104328.2278289-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0273:EE_ X-MS-Office365-Filtering-Correlation-Id: c6e01b1b-98ac-4fa1-2020-08db9a580759 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpEPU/wJLY7hod/UA3ILpuOEGVXZWWgt63fqYqgaueBRq4MihHK7yr1z7DK/NnyfIvrL8RoXl60qwARboMypvqNQoDhX9BRnnWi91TCBvPB0Irff/+PWmurqZMYUX1l96uNorHQ3jvMjEpcqRYfRM8J8imqa/7sGYPj0jONNoWMIpE2ThY4K/vabDYmYLfuRbzSMsEnSzLMw0GV83gr/dALStr4/TGTHKQwVFdu5nfdFT9Bn3lkAj69rBMjYXwAs+Di1MJr9/eWl7cCSqRJ0+l5088lmH7hUT+4yUOPDJ9rQje7dsD0PCnTdsNr96cBPPTX8imh5nh6OVJ5Hjpv7ipXgq2zCMuZrtV7NuU71ewEh3B+jg3ejApd/z9ipvz1/lufkI+EO0C9xajqfFNLkze81rXA0WgwkMg8IXfNFP0WcjUx0kiZRiP86yO4v3N3WpvdHhMaiNp1ujLHk/qhRZRrd0TdzREONwY8gZxCYEJb1fXZQCRDs/zRUCrIQgrqa2kN7U2A4Yca/jOIszlsZvZQidgAf3Enxt++hSZWp7CIG2j2ZquDV2uDyVdc+U8LwE6quV7mK1RsZ4bXY9d8uxKsFn3rcFaEmY+a3hZz0KvjsSukT0pSL1GC/M9gMpxtndhYIC8mBBOXbUuJGtgE4xY2J6s+XTdE9qIbZ4tq/aYReX1AVybjX4dUIXemx/f7GTBe6GFQiMz6ZChhg/aIw5t3bgsWqcJQgTEeO/clTf0QNb6cnz0djLHeh79uhjXzi3E= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7sOBaiafViP0xQ5sbhJKVGCB9NjxbwQSUJvqUoERutOvD2x2UkoUy9A30WYM3kR+BYuzP5ttZYnpV5j9r8QRCQuLJT8rtIjjsQ61Xw2UYHPwNCARSx2SZdJtmMoplo8sSqMXM/Mhog8dBTVWZPskYnjoORq+Q0U0KCtSKx37ldxe/xh/BkNLDr02brtyUU9+WhbWH24vlnP5coVSaYufpZnOEGD+IywsCx+J8ZtasepsPZwhBXcEr7Ad/f27kiMglgJvNwooLyKJwT4OwA30sI1Ld7SN8iDrl2KdPSdzWCWnPXTCMgYvi7A0XezMPDcm0ug5KI5doTK+2J6qA6/KqPEZZ5LoA4+lkFspRpJ01Zft1gJTt0E50BZC4cVdK7ADDjt+ya7nUXTrbAWT5RPt/rKM8jj+JAicwecTycEukiP7iDlv1t6VdAjuIdTc83IXZOrFX0+vkeGlfK7DcHuPuUNCMku9czAyh6Wyep1zxWjnbxiDT6mteGc5+VvXn59dmDnkPyWikLYu3yCujHoT7liQgi1MS0+O16vp5b+ZF3ywxea9RU3cpu4T+6SmurtRWeG9G98nMh37toiOCsRPh1VOC+GAEbrv3yB9g89amCYNDYgds61e692yPlOh0kZP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VJNyZYEpwpfEVAUKyAjtvhDL6TIlnQqL4rKukZJwooLs0q9jrG70zHJR5TwauGYFRKeKye2Z8kf/RIR3gRWuEJZdvPVgmuxVUMqpCYV0KtpkkheDKCBiZ6vL4PzkcXRw6c2ODkIr+RC5ZbV15qvdIswaWEsiBqXEPZv9uTrp9Un8IzRXP60t+I7DnWjRjb2HqsG2GPEKXfwYHPOzRJWU3DXNWy6dp7p1PiHH59FmLEFIyA59n9UeOeLGGNO2mHZXPd8ViGwCH37uuY8iWzvXTLwCRLujhXFbxNKtVJp0Tf2NH2l4AtcCDgjnTJau6hvqv0ENW5Sk7g47PNtsiDGUlcVzruAhoEVtXNPXx4NLhCq2/Q7ypYRrJ6EfqUnf4F5OTzC1/v3Ih1ooZr0neWcMi9blTZWGXD3ntMBZ/YD9VgPlg3BbzYtOMFlPnY3UxUvtdu/InbJY218Wo+zAtePjdy6457V75VLZeWYx+JZHEkgUrSbSJFiAGw+LwmSKMyHa6i6f0G/z8f4ZfhJVbuMCQ6tyjZndyjrHS2fif39HknnC/xOYy1wrLrj0kCx+Nad0KCPmA9OJH0r39zNM54H98ORpwn0T2nBKbO/B8RsvcJf6851p8B2McV5kgeoGwaH3lTHGISm1zTmUBJQAx/582w/2o4Eh1miox5oK5oMUyv0+7oUpScd6Nq/RgqvZk4dLpijZb7iFFHd2GKyi0copTUZkEltGlYdBva9U/7cKIDjdJQw1rmM6YZvo9SUn6k1VUpy6Ml7h/ewP1k4jf5hHP16/Nlwf5sBcI6vqUNlK3RfbDkF9MviBTRzlfDBa5aaFZZ0OuueX6SUED0TUnPLUyAvGYuf+oAXlkhNvfqMvWDEfo0FsP//5dWFCxmr8QPMR61kzuXnc/Kap3h78sYPWeRPZZkTqEoEjNnFFFqMtbOIdn4pJA97m516K8164TDBjSaJdywqdCwkpzKXQeYLqWUJBh6K7BowdWqnPCuP9xcB5KCYNgXlhtGd9WifesGEI6qDmeQxPMn2wMnW/BlTv/TRAPdMrVivPASD9QA0tvw4u0gigx43OYWTrdIyOfaFnrBNo62esPep1ah9eiRL6ZDVWOwlELOppzByf/YpO2gkDXVzOG08d6vMzBqjCAKrbkFLQXI7HOcctw+Ezs64JTopaaR/10q6O8f/Wz8pNYzqENKMOS62xZZbED0IfUJWdp3yfU1IRHJwSE+c5ZT7GgBfR9FNd4DlU5wUzxBtPl760e14tYkPrqdq27+jhrnKV X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6e01b1b-98ac-4fa1-2020-08db9a580759 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 10:45:25.5030 (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: PR3P250MB0273 Subject: [FFmpeg-devel] [PATCH 8/9] avformat/matroskadec: Use named constants instead of their value 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: Bu28hFfBq4ne Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e6797b2f57..21f52ccab2 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3038,7 +3038,8 @@ static int matroska_parse_tracks(AVFormatContext *s) } // add stream level stereo3d side data if it is a supported format if (track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB && - track->video.stereo_mode != 10 && track->video.stereo_mode != 12) { + track->video.stereo_mode != MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_CYAN_RED && + track->video.stereo_mode != MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_GREEN_MAG) { int ret = mkv_stereo3d_conv(st, track->video.stereo_mode); if (ret < 0) return ret;