From patchwork Wed Aug 16 22:22:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 4725 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp1264427vsu; Wed, 16 Aug 2017 15:22:37 -0700 (PDT) X-Received: by 10.223.139.89 with SMTP id v25mr1971870wra.248.1502922157457; Wed, 16 Aug 2017 15:22:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502922157; cv=none; d=google.com; s=arc-20160816; b=lrQSYP0V/NPe9ruO3hrNNcFlceKHEjK6ZKznkCX1e1gS4lbGWzO43sT79emSbpR1Mm O67nvWCkYldi08Tj3TA21+xb/QJzZLrKwSqLmVILzYDHXBscqpNiFwtl8juKOvX79MEW Ga6EO4nXVvuF+9Th1UOne4SBvV+HcH/ssDEXeaAo75ek/bhPETSt6YGN9Axrp2yu9BBt wNVtftNhEDt5bPFm+t0RltI+TBRWr4whiS9Fe/cXWaFwCwyFhyTzTIlDnO0CKaniHrxW DwWWhR+6rMGBUvmZNagFkqJ/vDKuNUz28RQeNqiwlu8cpEpToovHKzLi3RnUpoCJvp1d YPIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=mTQ6z6epDBaTEJnqjHglWREOC6hHAZ8n5zlkHrbrSHE=; b=prTmf8MhSALf2rnDW0fnIELppMsgPqdmh4n3krWIu5Zb5DZKd6zuFBHetNiWdxBDK0 ZZhFxrteI9Off06lmWuaBM5EfHEbSRn7AMxJAuS3PYvH319dmvfU7LRR57NdO+dRJm1a h57SOPMyNs+27S12B4Qj9melSclcxZRtnrjs3tn9GCmLmZ2AWdDosPLSjHlBZK0oIcuB ULNrfJIBQRe+Y+dVXME4tssKpj1yYmgKEkIMZkTgNrp3gluEQ8/kKP4i96lv76IZ9OKB iHqaQ3AoEGpjsjumKNiXnvGmtu6Kjan8T0mPxMH8zw6GzUnzGcq94Ur/4hpYnacmBFXx 2L0g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k136si1517108wmg.85.2017.08.16.15.22.36; Wed, 16 Aug 2017 15:22:37 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D28D168987D; Thu, 17 Aug 2017 01:22:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E08A688357 for ; Thu, 17 Aug 2017 01:22:23 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 8342E102E51; Thu, 17 Aug 2017 00:22:28 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7pijQ4zvMpP5; Thu, 17 Aug 2017 00:22:27 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 0C741102E0D; Thu, 17 Aug 2017 00:22:27 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Aug 2017 00:22:19 +0200 Message-Id: <20170816222219.13345-1-cus@passwd.hu> X-Mailer: git-send-email 2.13.5 Subject: [FFmpeg-devel] [PATCH] avformat/utils: always av_reduce r_frame_rate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- libavformat/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 58283616dc..23865c88c4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3943,8 +3943,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (!st->r_frame_rate.num) { if ( avctx->time_base.den * (int64_t) st->time_base.num <= avctx->time_base.num * avctx->ticks_per_frame * (int64_t) st->time_base.den) { - st->r_frame_rate.num = avctx->time_base.den; - st->r_frame_rate.den = avctx->time_base.num * avctx->ticks_per_frame; + av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, + avctx->time_base.den, (int64_t)avctx->time_base.num * avctx->ticks_per_frame, INT_MAX); } else { st->r_frame_rate.num = st->time_base.den; st->r_frame_rate.den = st->time_base.num;