From patchwork Sun Dec 12 15:43:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32334 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4314603iog; Sun, 12 Dec 2021 07:44:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkaXgTPCM/P62hvafGzH2LccDKPW8zUStC8HnadBViblv5uTI8x713Ciomz5HIULWFdyKB X-Received: by 2002:a05:6402:516c:: with SMTP id d12mr55395138ede.391.1639323855889; Sun, 12 Dec 2021 07:44:15 -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 l10si15833967ejo.308.2021.12.12.07.44.15; Sun, 12 Dec 2021 07:44:15 -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=OEZslpNr; 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 ED4E868ADF6; Sun, 12 Dec 2021 17:44:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073097.outbound.protection.outlook.com [40.92.73.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5A43680134 for ; Sun, 12 Dec 2021 17:44:03 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZyGzne9XICPc8h03arl1ZAnewsNpZ0NI94dzZdybCOcpzssvV9w/ix5JK+1NMZJi+qzCuG33gUjuVnVNcaomVZ7CUcsKrQLLOXhKHMFn+rhKHU/fi7baoc2lfo6HWyARaidB9HdNFUCw0Fc4sZOs65TY0kjkhbVvU79be/6E1H8QzggbITR9h6CDEsv1s+SrbNNvTR+0IemunURGxlT74E1Rb9HdugTNDSb3OgIvW92L8yyyM2ifqP4IfdxfHfnHlm1N5h0uYQbM35e25Lru8owkN55dQohFQWY5uVyA4sBWh/OLpf/Kyc/RdvwoCMBnU3DUSZgay2Rh5W4PrGcYaA== 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=DE3VVIxViCSiQENG5pzwRoOaAxl3p4VeJNhVtnm/vqw=; b=SFM100eZ2Ve+QK0r4i/N5LFVMGTTxA+Uaxxwi1MQWyj2oWIAGnthbKeXPxVKr/eNiynzbRoZWkgIv8nsCFN0ncR10CIvW1mscm/4punUb2PFGz976HjLuc0S6edZFi2bfzXorpAwk74kFiGs4VT3x2hY7RsW+c4cxyNukOLmAjJ48P7ioaAJuP9Ap+Wnk5qmbEEco/v2lB5LNBXl/fBxofSuBI2H3hfFzla5Y2p0eTex4mi28djG3+9cTktJ2rN7/ECGQWzGThEKoM/wPe0AdPhhQk/Vocb98i9PXtSShFjt8y/82HsFlEQEfxF65pW/nDQiVIO6nzIsnelWV/zj9Q== 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=DE3VVIxViCSiQENG5pzwRoOaAxl3p4VeJNhVtnm/vqw=; b=OEZslpNr6eLkH9H7r00CekcUcfEXW+dOgcrIM6NLCpUNk98kqkxu3d620C9g5qijqgeok0n5rt14qh3K/nGiWSFDxR5pFAfX3ZuXo2e7+ba6UJrMQmNu6P+XeuupZBr9yHBjfE7QyFlz72Q681pSbx7pD+bxtZf+krCwgdch7Bmls28OsQmieqBAvnUycKu62vnQS+JEBSUyBYkhcZOlPzFxAhXNMWcVpzHBXv0xYPN0gkZNTzYcoKLiqx/d2Ts/XsAWsgvsl6eNizFJLd9vF5VCaxKqY42ukhGlKi/t3YtYlHwF5Pi4CD1Jmsepbm7CkyiG5Pm2l8cPRDjGfYf6zQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4615.eurprd03.prod.outlook.com (2603:10a6:20b:1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Sun, 12 Dec 2021 15:43:58 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Sun, 12 Dec 2021 15:43:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Dec 2021 16:43:50 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [fmPA0PLE8T+9L6h6+IWyhDeFzNy+SzYb] X-ClientProxiedBy: AM0PR02CA0142.eurprd02.prod.outlook.com (2603:10a6:20b:28d::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211212154350.1511901-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d26bfaf1-fbbd-410c-15ef-08d9bd863601 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRhTeYa9y1Ya27Xypab/6mEaHfnqmFu+YEJtp5pDCI4/X7sTotJ+b9T9PtzHdxmKtVUD4+fir/R1KPj+f50mL4n2Q7ZWfDwtb3cc1hCydabMNmFZD8qk02MG+XB+D6fm4t9/oO3UsrtHsecdi56icDUEXtTxXTTQjcuty3Pz8EAztjhtKJqLxU3UEdui/zQJEqsaNxCsjDozHtBpiopJXDQsCiW94Jvap32dB0Vf8+2MFXUvudJ6q9EfPYqaeHYXcFRKDBbJmh4xaYuPM4hV73C/jg7bcjCJOwL7XOy2TkWxeK1Ls99r10YqvnqoasVU10mEIQDqQA6gJOC62B34fHG0XOdtCWXQziYuVbWt4w6h3WbmUjqf7S8Z3mO2JMjqaBDwCuVIdjO2kPNzzSpd4LGljQamJOcf7D91SyMYn3hTllxc0/ZRxIYYAdulEDLt+VRq+71VmG0d5WBDtsrhizC6XC1zH7F2SJzBdCAUXLeMro3a07SRgvjeuQ3vJTJHSlM1BPPFZ88uyvWAoMxFbdfc5bkyTXOvL2yA9Vyg4vcgUp3zG5asp/AEyOU3AeAUx1TbAwzL8OBDkDJN7oqr83KgUcYavGOPkjn9FJsVm0MohNppBaUxQTx2OWfGKBo+aSllj5KiWntOT/yAQFFKUzvAMY2gLIbog4YAN52pE3IewoomBVG8hQErkWew0RHSiuzKBeLyCwV9GDZE2gyS5fkfI1IVLVDwWI6KZ5EaiATIsSqXTKBp3UpQN6+Ai//m5Y= X-MS-TrafficTypeDiagnostic: AM6PR03MB4615:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vDPtB4s7rcHiMR/PbQpgXafexjGA5VkXbJ1XnmsVL+uTWMpvhT5hg7VZj93fmo0mg3j5ggTxoFQ4mdfAFg3FsBiNEs+bliNEmvW7NoWXuun5+ngbtPfZDo6HFNyTDkNbmYJ2yfvQFfGKiqMWjV8DNN/MQfP28QVeiznFXKgsh/gm8uTZQCUJphXDUxL1ZZtSCErVYF/XeqWX99/kx3q95uyr0PKuziLLXGpstyo9poHMKagdVE7FRByX2tDeztv3jrIA20TbLFZ9HqCOq8SwpD3kp0GbE5SCLK3tiBuqmoEb823xW4r/gxRqYbw7z18WE4p5xpSRyPFwUw+hIO8UfDoREXtrSjMaFS1osVgXQ3o4QYTuJq30E5PAD6NP8zIg7hjElPL2WHkM3Lrtdc56h3pmrTQ7YPpFKsGPXixvTskpDtn8iq6Ucbv8EkKAt3cWOerhD29NIZsEtAFAjs6FsFG2L/Y4rb8FMtswrar9K0J3sF68miUk1NNwxWHuhFrFiN5ONkbzf3q8V4zH3s1ER0dTk8EZBFZ4MgZK9elplSkFjW1S0MwrXnuD4QaK3k4dcZ71/x0oS1/p6NFOCvRqRA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Eg22a71cIB/jVgzT0+mMekH+pwxTqZ4DcR74y/0tQ1tLW9neoePb/I6y7O4lCzJd9klhU0E8bvSTU/BqTVP7uGkWrb5VFmPTOUG7QvFqIdSZ4Cs2v/ZGFMwGB1EnArbYiN5zTD3MgI/Bkn0RXpEviz/24BWkKFonJ7tyGByCnMAdo+ao5zsmMzIk17RQ218IjY6a4Xud/lTxMELQ5lwrUE0uUN9qmEvhfDKkVvRt6AYgTBt9csuee2PmbHCzYqABbmUopXjLeQ579YtJkN2hsCaIxqxmipVRRvdgvNrVP0lgsCmoI2wS3NutghztTNQYTxuiPzH+i55gKbs15XjvwrrmhyHmJQzeOZnJST9jfJdjWERp3b97gRYFYZuWFZtZxYB2e05pWPNpK5/lvtDnyvVc6m/WHUSu6JCuOcXtNgpXw11g3EvguyG0DS6YJzCw/Lg5mCrXuoSzIPwF4fOnEh1YB/QRpKf8GalJfPBFGD5l2SbaFlPIJi/wf0Oj+6qxQ2qDDaFKBl1Eo6YmnhWAG4GVwJIJlCA3MNzrcWysRQlvKSJM4eoLixaWo/hDvaV6kCsD2zowQS6SU3YEMTBzQqki67yBOLOaodBaKf21WVrfzHt5QWtnm/kCtrbYzzWUcxAs8RlB75R6Pn401iof7Joee0uEq6iQrmCfNU4VlLQCW9mfY+ldNt4D1uc4wqtqTBc5Kdi97q0nCPd+LrLOEIZPmNPUeJmueqRbJDPoIxAU0V0kLWYhLyJ/7wxsN27Wc9Y9aDjryX8K3Z+mJ8ryfXGo6LOWJgdgdta/kHb9UPP0k/mEwokMrUwvuiGhfXeKHuAKI0UMZWXMKrnj9vujsgC/UhS/eRLRv2jOuk8dfAIyvHXhtFHsUmZwP5O/h7VfgGhGiNfik9oIZe2MaoH7EwEzgy2ApWwfTfmT024z+ZmYY2p/pzvzBu1IcNkUn+6ESR8wlOluBPCeNlGqByGneA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d26bfaf1-fbbd-410c-15ef-08d9bd863601 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2021 15:43:58.1130 (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: AM6PR03MB4615 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/moflex: Don't use uninitialized timebase for data stream 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: r0UzDeGwmvvX Signed-off-by: Andreas Rheinhardt --- libavformat/moflex.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavformat/moflex.c b/libavformat/moflex.c index 67adebe5e0..1d342417f7 100644 --- a/libavformat/moflex.c +++ b/libavformat/moflex.c @@ -172,7 +172,7 @@ static int moflex_read_sync(AVFormatContext *s) unsigned type, ssize, codec_id = 0; unsigned codec_type, width = 0, height = 0, sample_rate = 0, channels = 0; int stream_index = -1; - AVRational fps; + AVRational tb = av_make_q(0, 1); read_var_byte(s, &type); read_var_byte(s, &ssize); @@ -195,6 +195,7 @@ static int moflex_read_sync(AVFormatContext *s) return AVERROR_PATCHWELCOME; } sample_rate = avio_rb24(pb) + 1; + tb = av_make_q(1, sample_rate); channels = avio_r8(pb) + 1; break; case 1: @@ -208,8 +209,8 @@ static int moflex_read_sync(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Unsupported video codec: %d\n", codec_id); return AVERROR_PATCHWELCOME; } - fps.num = avio_rb16(pb); - fps.den = avio_rb16(pb); + tb.den = avio_rb16(pb); + tb.num = avio_rb16(pb); width = avio_rb16(pb); height = avio_rb16(pb); avio_skip(pb, type == 3 ? 3 : 2); @@ -237,10 +238,8 @@ static int moflex_read_sync(AVFormatContext *s) if (!st->priv_data) return AVERROR(ENOMEM); - if (sample_rate) - avpriv_set_pts_info(st, 63, 1, sample_rate); - else - avpriv_set_pts_info(st, 63, fps.den, fps.num); + if (tb.num) + avpriv_set_pts_info(st, 63, tb.num, tb.den); } }