From patchwork Sun Nov 7 10:42:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31317 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:dc01:0:0:0:0:0 with SMTP id b1csp2383061iok; Sun, 7 Nov 2021 02:42:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+PwTHUNs+1xq2WC92ZhiXrmqGQuqHe7K2/HOTSGy9GrX7pUPwaTUG6WSNA+6UDCowT1Nn X-Received: by 2002:a17:906:390:: with SMTP id b16mr23806082eja.522.1636281749832; Sun, 07 Nov 2021 02:42:29 -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 g21si19940103ejm.276.2021.11.07.02.42.29; Sun, 07 Nov 2021 02:42:29 -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=jyJU6Q+9; 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 CF6D468A285; Sun, 7 Nov 2021 12:42:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2091.outbound.protection.outlook.com [40.92.91.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DEAB680B71 for ; Sun, 7 Nov 2021 12:42:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cDkds/EBcj/Cm/g1Ghgtj76IZ/DwESCYmrHjXM4wm+zVadzhJrGBCOtnEOiydw/vAlZXVCaVtr6asUWheDNydRnfT5sNxOrOcOd1LwtsaU/q0z7tyt3UFOJG4zw+AEbimyBjNQYsBz9B+UK73LDpaNAOq4gWvGZXOTGTqjN+rBFalY2z7RG8EER6eloJfSjeB0KW4U7jR1A5vQvPVccjtEnijZE9uOti3KST9Tb6eGmwWYONSX/sPlTsPwdUZI3mhreJKduPRnfCaM0eYRJSudSsnBdmaOdK4+5oDzI7xL7bmrVpDmtfk4jXHQPiy+KVBG1XFDHckiCKSRj9hRTqaA== 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=MzFDpaeJofSLpITwd5502vHqZwZUv8eyAx124BvASYU=; b=WOzi7dcvW/w3SgrksgwDK4MmxLTwbe/DJ0RWgmEAasMnHtGTlEwqImVzcyZ2kysLtuhluHg3st4ecBOdfBTgeGxjvzEtXeetelcZOx/QCeSixjG6zEFogIgQFdIwkWO10b1Ay11l3jAZZspgPMB1p4mGxQZRVFXymJ10QQGXZhV6sMXvEg7VVPznsLCDcCz/7491KU74aR3FfPyh3vSh9c4W7WYYv5/p9X5cF2LqhcIKT/CTRZN04XRZs0X/cG6auTf7T84MTBJ8Mora8oLjhDP8rtkxMTjQ5GlxddwD9N4AvQdG3PhItnPtKukD8cpeGeaG4RX9NQj+0uFJN17EjA== 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=MzFDpaeJofSLpITwd5502vHqZwZUv8eyAx124BvASYU=; b=jyJU6Q+9L9ZGQvCm3XdsFbmvLcl7lOFUNm0h1xXJYjwF+uZm4QxOm0exfQej6PPBEiPcNXK7T8fSUZAlsRQahiJ9tM6NMR3ukRymOukIhSMj7k5jzFgzZhfr7vV93y3J66te+f6CwDlpmdsqppkI8PKmLY5IlOn7h38G5DE5s4YCPzt+SjUa+wLAXkyDKez3aN2oFwNwKNXk7U7kLl/DDDTKUj4v9KVqfnvoz2Zd96K9DMCpUzoG/0Td0GbsCrT+K0+/NCpJYxv1YPl6LagofRB9GL8kksVZ9HwFm7WSI8ZRGAxN16Cc7V86gro+HPWiHhnw40vt6gZFzJ1uDboT0Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6981.eurprd03.prod.outlook.com (2603:10a6:20b:299::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Sun, 7 Nov 2021 10:42:19 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.015; Sun, 7 Nov 2021 10:42:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Nov 2021 11:42:11 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [qdCqefcnoPREJCkn11/FT9tpaOW8FmNg] X-ClientProxiedBy: AS8PR05CA0011.eurprd05.prod.outlook.com (2603:10a6:20b:311::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211107104211.179411-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by AS8PR05CA0011.eurprd05.prod.outlook.com (2603:10a6:20b:311::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Sun, 7 Nov 2021 10:42:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f2a457db-9a43-4de0-41ba-08d9a1db45b2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiToJ1zOhCTJMxThXxxCkMRwImS84J0CoFFakIUE6CJ6b3L9qHEMFo7sVy+8qIVneYIDKd6pnPNbuErBKisMyEYWVL+hLVgjDu3KZ4/3QcOsPeZJWSxABAmY/R6I1Uktm3cU4URFejvKkDTvkxrTr9wKV9/0HZdifdtMOvhD8asOUOQ6Eta5KBrnRnQ7GDJ3cBcg32wBPfGwduLemsAT2FGnrXCsonbsE6KmfNdpiim1gZ7N/9UDW4iAitsUls6A8Ty6FRM61ElekVif2IJvwDQnh1FlGTLKB1j2Z+DTpr+q8C/8ujYmfDJhts6vlO945fo6g9zhLm5rcLoGKLHr4DtaEZaWWVeXJ9h5WDWzV6jH/4xPAAx3c395AOvXLa0AtGD3WGhW/3LOXap4pUL4I4KmYaYZelAwRUXwXpE88OwJjk4Lu6CP58GS0rAYtoEAHkSBIIoXvRjdwLKZK6IZY3riThi/c/kYEnxUhzWIIvNwWDYR/isqcM0uY9deN37UC/jR2ylgoj8jsTQKbj1zMXwRshFmn5rQ2DXrnu+NUCXVoR3Usi9L4nPNlLUJJDX4xPe5cjorJtAZHjKE3jp2zrvFSBBj99g9q38ryYD/1W8NbMBxU8I2IKvWguRB3jR3BpTGom4jNXzGqJzoppgy0capgxiCnGBdp6NWo5yQQdNap6tMOoqRXITF54Ho03YWozyCUcSWBLMeNU0eqdQXogV1IiGEhE5GGQIUR7gN7IWCkPvREsfS1+Ucb2flfvaNAB0= X-MS-TrafficTypeDiagnostic: AS8PR03MB6981: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CzDVTAW5jpVBEp6lB608x2zCA66mzSZZEeYZW3rjIJVD3+lMlFxIr/G1I5zf6AX9UPcSxDX+U16h/di+uvEqDtauiOLXfTLKgyNMOS69UzDLnxharg4tlu9g9QyxJkdQxbYnyF35664/7vSNiPBZD2/KyvB6V9vFYauDer+lRo7xIYmGaZ9Q9Z/bjzumIEWXBbOH+uHlUIcnxeF5bM/0QpDn2vDbvPMQqN3XJTqSncBHwaqq2qeAjryp5qjMqc63BCzeN1bZU1von75G9ZasT3tTsgfhVKnnz3bBQYKbsA6x77TiP5BYT8A+nsRXAXD3bNZ35g4hcN7HrZoarLYOSfpQoin66hPlcSm03pmFee/3/TIo5/IfO5a0Cdl7/3DISryQrlE8mihBsvygbWMbFcBmXl/jk805w2e9gXuHN6/oD1cyNS/iXdZqDGqNa5m6ymEUZh2dWrXfJkvBhTZrMMrGDTxGvRqNyhJ/4hXKBVMSOcPXldAis6sfixXIUYums6Joi3QR8ZFl5VZcipjT5PiC3hCcVlVw+ZqXpt9i/jc= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bxZWyA+3OafyYzbLwnM2jhAu5Vc3VOUEtr9kb6LLpGOeJXJCGdUeeL7oN5KPZ5jZdQqQ03zwCwQ9dcFE7m5EOSIp2hnusGg0jtAWlIoDUd1xiQPTDcod7Q4a9nuemqiycEPZ2wP1dWh71mErlpUwmIjc9JxtFjT1TfVOs2MpCFL/jkj64iigpGZEMnjSD+/L+vF5Uc9QhP+85oDsrMHbfIQSg5A1athGWSi14Izvc3b108kMS5j6jPUiE9zm41FZbE45y2hZAoAolF8cMS3vVSzLACEe/9K/8WwIHbjGrlnVyPIx68VfcstOs8WCiqOtWML6jQjRBg9b2mG+89bUYGVu8+Ub2FLexx1Qn85VzUmWXb9ZXe3iR57eQQoMGPQ/IJRuvjvvtXv2dk1qdm47ZyzR8S9rjNNTscxfT/WRtvb+DfNCd07LEU6SNa7k4x2pnpeX1qeM87tjQrhdoudimisAp1FPjVMYy30EQR7nriyAptiq8RSeQA815FmNtF70ufqhIvqMw3/Sk4Fy0WileLQjM6rmoFblT0IaG2gf68jSlhvENDnbc9UrI1RZajhHB72oKN+kNBV3uavQlz1uk/DX/Ok/X4e0CNhsuwbuVazdSxcfD0Ih+RZra5FEzxTtWvpSjImkTvPbFKKK7aXI0FcEX7IM7JM/KUeHFqg9kLsea7DoQCUU/8v1m5VClZ/5H62t1U6bkwKaCHf93pPtVg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2a457db-9a43-4de0-41ba-08d9a1db45b2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2021 10:42:19.1295 (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: AS8PR03MB6981 Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec: Don't unnecessarily reduce aspect ratio 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: oKl+rGOTM4lj Fixes ticket #9497. Signed-off-by: Andreas Rheinhardt --- Will apply later tonight unless there are objections. libavformat/matroskadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b2c4927e43..a4bbbe954e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2806,7 +2806,7 @@ static int matroska_parse_tracks(AVFormatContext *s) &st->sample_aspect_ratio.den, st->codecpar->height * track->video.display_width * display_width_mul, st->codecpar->width * track->video.display_height * display_height_mul, - 255); + INT_MAX); } if (st->codecpar->codec_id != AV_CODEC_ID_HEVC) sti->need_parsing = AVSTREAM_PARSE_HEADERS;