From patchwork Sun Jul 26 12:26:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 21266 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 05D6544A760 for ; Sun, 26 Jul 2020 15:26:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0B7368B5B2; Sun, 26 Jul 2020 15:26:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F55768B554 for ; Sun, 26 Jul 2020 15:26:32 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id l2so1655215wrc.7 for ; Sun, 26 Jul 2020 05:26:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=W2VjuZXmn3ReAkU6khHYrOKdHri/gjBkZE0fPmxNCc0=; b=CkgYlRdpu97nEePu8PSBD13QnZIHsSIp2HSpoTH8ab+3ZcQ410Q5ODiY19lzoOFNi7 5P6lRXAfaiLdUOVcLcP3QhVti1psozRZYat3QEv2LZK6bLd6sG4HujQYKAWy20KA3iI+ uzBX5b/iiw4uZVhfTAt3bA7pb0csGOXqw9fGVHjwzcU8lp5hE494KkUTA1gc7o3bcixp y9Pl35kw424cxEPtEkUDvElpSx6nFZSbUbmhD0rvtf5Fv4EQm71ogTXOP5qAWCopEIKd 86gAHg8lns3lvZY8+j8YwVDN4lV7ut/2l3+zBWmjVde5VU14Yc9o59DiWl12LT0I6DwG Uw8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=W2VjuZXmn3ReAkU6khHYrOKdHri/gjBkZE0fPmxNCc0=; b=Oq0TmwsGu3AvgWOKNdM8el5HbxWW4OMn7Nm9fskDgKnu97Yyi6L3OwjOrrLNM4g+9c mDB9orAmciJq371wavARRmHyyuTBlcW4VJcg60aQZ8SYsYrEKPPHBI6j7wix/2s/Cr9H qvbw2w9PUW/AlCV/fprpD507JTWdxtiMaNZHvyQT+sIYhkdkaUVm1MYMq3GKvH+OyNsF HVM27GmQCcV8yqKIv9F3UF1YjpFpV9wODyqFJgY76VPEyUp6n1Gn/FPY9LMt+iLN23Wv ohtRn+wY/2aLWKziXUCRPHOfYjm+ws8ROzw6knZkSU0PWzBQ6GMm3Frg4BeK+xCr2XJ0 YQ5A== X-Gm-Message-State: AOAM530/q+1CdywMT2tgJuvuVyf3J6p1Ps74tcN7SQ5FQred4/i8p7JJ Q7E7Klh7ZeWlv+tCAOXb8MfNACP0 X-Google-Smtp-Source: ABdhPJyHiTHEdQNJ3op6nmg5LJVwAfNkC0z2Y1igCSmlbFeVh+fxbkay2jR5ItkyFjvj7nahwPlK3Q== X-Received: by 2002:adf:e98c:: with SMTP id h12mr15907760wrm.3.1595766391825; Sun, 26 Jul 2020 05:26:31 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id j6sm8506576wro.25.2020.07.26.05.26.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Jul 2020 05:26:31 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jul 2020 20:26:03 +0800 Message-Id: <1595766367-8861-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/5] lavc/libkvazaar: fix framerate setting 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao fix framerate setting. Signed-off-by: Jun Zhao --- libavcodec/libkvazaar.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index 02bcae3..71c9c8f 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -80,13 +80,8 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx) cfg->height = avctx->height; if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { - if (avctx->ticks_per_frame > INT_MAX / avctx->framerate.den) { - av_log(avctx, AV_LOG_ERROR, - "Could not set framerate for kvazaar: integer overflow\n"); - return AVERROR(EINVAL); - } cfg->framerate_num = avctx->framerate.num; - cfg->framerate_denom = avctx->time_base.den * avctx->ticks_per_frame; + cfg->framerate_denom = avctx->framerate.den; } else { if (avctx->ticks_per_frame > INT_MAX / avctx->time_base.num) { av_log(avctx, AV_LOG_ERROR,