From patchwork Fri Apr 30 00:45:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27530 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp2050478pxb; Thu, 29 Apr 2021 17:46:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDih7088dG/mkw1+1qvzdBz1v9ElGXN9Jtxii7OVzvAy40Xk1APutYE0e4+kltL/9Ng8zS X-Received: by 2002:a05:6402:1c0b:: with SMTP id ck11mr2715260edb.264.1619743573339; Thu, 29 Apr 2021 17:46:13 -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 mh19si1535750ejb.312.2021.04.29.17.45.50; Thu, 29 Apr 2021 17:46:13 -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=CY419HNt; 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 8070768A252; Fri, 30 Apr 2021 03:45:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064037.outbound.protection.outlook.com [40.92.64.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A893168074A for ; Fri, 30 Apr 2021 03:45:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M/JP3sfqRV2Bt11RMlm0c9PbjhEqFLlEcSDCLrRLGsVZ5MU4dnS0wwMXh1qXK7yWMxXitCTneg2wQZu6GYhT9Q+AH8zJgsS+MpwdNmxOw4Z0ksa79iqBBmTpSWWUPMbu0b7Dhai7dIOgpbOqKcpkUOh88MeOSmFF6m62Qc1lsOiPnd2DLT3vl911iWi925qkDAohVd2sO15ozMFl1Y1jevQdYwSt7cTE2CjZBxPCTdAvfowL0ChNMA9TLx+IJWwFHOgJY/3msfHSjY4rhrHWDOZaYtu8QJETTKeaOHQ9OgweMWxrRP+/ulzAWUbi6x/r8DvT6KJZ0p1g9fjAdka7rQ== 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-SenderADCheck; bh=kLsTDUB+B37/OjJXy9asSSZKBzlAnMA7G5goP/lqRck=; b=k3JoYxh4mClpP6m3RDd3P0JG9CJlEfHNGcYPZqWFnrf9SqvOPDiQYBe0meMc+9KN+lnWZERYRXIeIyk6jZ4/Sq+xSQg/X3M1JDOLM80W79GqjMw2vmCL6mvCK87/vpYglLm1tOBGgSSJ2CBB4UhnSsbk8zs5OkJ0udpxwTcZisK3uMI0b+yP/96dQGzcEQYo1i5WxACzL0t9+MjqKyYmIbgXvBBluXB3vfjtbgaXH7OK9l80QZyFCbRmUQ0Tb+vLmNo6Mk3OxFsb2tAcsU7pwbwj1psdmC/Wtp0EuNVEekR+0XCVo1QGCxp20sjJ6OB0zE3MQmT4qaenJUeg0yEqJw== 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=kLsTDUB+B37/OjJXy9asSSZKBzlAnMA7G5goP/lqRck=; b=CY419HNtv+yQlr43S3MhxnMppbc9LfkvkeV1P6bxrR4FPbbY4D0COiWab+3wgpM1psJYKM5QoUL268vQ9tPZALq3krCrAqKjjUxxjy/ubCz9j/7kSH03MHRANgXsM3An1kJJ+FvUL+jBRaZ4JFwvbZCEY/srxAXP0D+1s3FSqZljpe9jcVEfubUAJcU2x42nvgUeSc/M6RdeAWgqrPrFqVSObh/2dTSZ09VlSS+rYIDKswhp6E+QpttQF1KWqDovLRZh123zwQ1OOuyRUexQ3o810TKeyWvPRZSv+mK2D2QpiosJjy8J/bW5geY7touT/zmioszjrxSGFf6aJe1eHA== Received: from VE1EUR01FT030.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e19::50) by VE1EUR01HT223.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e19::445) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Fri, 30 Apr 2021 00:45:37 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e19::4a) by VE1EUR01FT030.mail.protection.outlook.com (2a01:111:e400:7e19::228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Fri, 30 Apr 2021 00:45:37 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D0B17765AC04986E0B2616CD868A3E1AA049CD1DA26C879AC9B1D4B13D40C7EC; UpperCasedChecksum:E306586A45CB8449B1A46200F8A8C2A104305088006FE140B77B71E348DC11B1; SizeAsReceived:7390; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4065.027; Fri, 30 Apr 2021 00:45:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Apr 2021 02:45:29 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [ugABhfpoT4fXj/4XRVEdEnvFEPO1CYm6] X-ClientProxiedBy: PR1P264CA0013.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:19e::18) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210430004529.2075019-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.248.86) by PR1P264CA0013.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:19e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.33 via Frontend Transport; Fri, 30 Apr 2021 00:45:36 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 82aa1bed-0c91-4f6a-bc8d-08d90b714542 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQnJqnaHo6w7dROcDgxMzATzu4VnZMazupMKTNlqRPUxQVY5h3OVKINfl0LDYJTNTC21cPB2lYHsJ5kkdWIFPvM/QKsKUeYm+UfRkF/yfqmWTW9MhEwtaqBjZ/P6sbYS8+r0GX6IpwR6JJP7Gp6pkBTeGzNvnu+Hx5lYIo96qKQT0Bta3J3+PbvYZ+iLYkyWPTAujOZZhLa6UI3W/dz91D3L308c5gUV+fmxeX0zR9Os5EdOGq92XR/ijfEVY9OJ9pfxF55q+6/9miEgi1Ut2spEjvK8Xa7gWgkhlqWjklCnyMedXhxOVnGiCgkRsLvLBEwErmZqK+nCZWznNzzwrDYV9hMZn8IY7h8iEWRY2UWOvO84ueAqUGQ4sWkUE9SFcjP+teYBQ5t2OGLAC4uxeIWz1YhLChkesutlHBq/Hsayt4aSsvSUwbWNY0m49nuHjfKE/XGktfOw4dPzoHJn+GJ4IydcRdn1Tw3zriIp8CAHunZQa8ywUa8Ey7iVsoAY0vMmZcfMNT5OXzvOj3cbP/RiLeYxivKUSPTpM/+LAfQzQ8Ev1YqfLbs8eXhQLcRPUNkVfsatsnOfca1bpiS7oVqbeiuSWvBc++hcqK7kjBrNGE8viVgkbR8zvYzKFwl0dsdC8/DgTArgDTgfIkwLYqvillvKFYfFJRY2vmVU3c+oWlRZCg7Voai8ihnlnnbPegUXUuOZ2f6K79PjXNSinpp6O0AANLXNgdJLnrYZ94WOjgzFi9Q62FosywDPtp6w+o= X-MS-TrafficTypeDiagnostic: VE1EUR01HT223: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mJLGZ3LF1o7cdbnm4Y9GwbLhQz2C0krW/IVFT18QzzIpaWOH4+CcVLKlRJeOGZ8/jZMRiI/V06nQAnCUFBC5S98zSb1iC2UQYBtLWRbU6Le1EHkOcT82XAOT3J5wztStuudR94jpgfU27uEcNT4Ehc5KnlMfSYCQ/pGCjBvFfzgtqFsBH48kjiSocaeVSU2yOV0/C80izIXAZOW+Rl5HCXbhFXyQPog2cEeMk4nm2VADrhmMqlC5ieIqB0dFj/MSIwvIweP1gpyXUY20HGw4h17+y16tNtB9Qn62yAU0HTN6Go6tvnoSiumxBy0GswBsicjZNRRs4kFJErKPaSshnMbmDd8xfwAzctQlUlS+5hRmYVIChUowagsSWkdVBpXK7PzNR9DavsBmP0L0s0GLAg== X-MS-Exchange-AntiSpam-MessageData: C10s/nE2bjy2dgQE98+0UkXuV0rgHdPfeAq53yK0d30OWCuqE1nQg8ZaxqyDJtz9lcuiqEULYwUQeJo/Cvzz/BhA5wprmBhOUlxnYr3LrUNz0E65XP04jKybSQf7GwK6VfKQLg34RofQ5uHJpPlwKg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82aa1bed-0c91-4f6a-bc8d-08d90b714542 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2021 00:45:37.3995 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT030.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR01HT223 Subject: [FFmpeg-devel] [PATCH] avformat/dump: Remove remnants of codec timebase 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: zVZyzzN7D4zg Fixes Coverity issue #1477414. Signed-off-by: Andreas Rheinhardt --- libavformat/dump.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index 9f54bc3e8d..04c93dd7d3 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -564,17 +564,16 @@ static void dump_stream_format(const AVFormatContext *ic, int i, int fps = st->avg_frame_rate.den && st->avg_frame_rate.num; int tbr = st->r_frame_rate.den && st->r_frame_rate.num; int tbn = st->time_base.den && st->time_base.num; - int tbc = 0; - if (fps || tbr || tbn || tbc) + if (fps || tbr || tbn) av_log(NULL, AV_LOG_INFO, "%s", separator); if (fps) - print_fps(av_q2d(st->avg_frame_rate), tbr || tbn || tbc ? "fps, " : "fps"); + print_fps(av_q2d(st->avg_frame_rate), tbr || tbn ? "fps, " : "fps"); if (tbr) - print_fps(av_q2d(st->r_frame_rate), tbn || tbc ? "tbr, " : "tbr"); + print_fps(av_q2d(st->r_frame_rate), tbn ? "tbr, " : "tbr"); if (tbn) - print_fps(1 / av_q2d(st->time_base), tbc ? "tbn, " : "tbn"); + print_fps(1 / av_q2d(st->time_base), "tbn"); } if (st->disposition & AV_DISPOSITION_DEFAULT)