From patchwork Sun Jul 26 11:41:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 21262 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 6F52F44B5F6 for ; Sun, 26 Jul 2020 14:41:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E77A68B5D0; Sun, 26 Jul 2020 14:41:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF27168B5CB for ; Sun, 26 Jul 2020 14:41:19 +0300 (EEST) Received: by mail-wr1-f43.google.com with SMTP id f7so12177446wrw.1 for ; Sun, 26 Jul 2020 04:41:19 -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=uSktRMXvP0E3aS0vnV5bqJ6PuzfmuinFoF5eSrEOeJr59w742dvebvr7oYaDYtWr5k dsLsrVMg+wSTYK4fZrxMS1fl+B1SK824EywbiMFFd1yluw4aiaKgNUGLHnqyZejdjYQp /ZJuoyryVulmDPzk+Y41nlJfkxdux8qcIiXM1fHUcuvjdLK49FkU5HkpKFR4llHIyYU0 XcSth21d6onytDqDYBbyRk6aWdWuT52P23Z/J3+353Ye7LFDhjoh8aIEOTXmcol98MHO RBrG9HmVfp5wNJpwquFJ5tczNZ/GhfzkNr4p1BTuafLC1M8sVg2JHqzQ/xat2lneqJDh FlHw== 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=aqQDj/9PDGVol2e66mSEo8ZcKbmliJJ5FLPiRm+ErI460vkXCNkE/Q33XO3GfCEb6+ KCjzA3IH7OP1k64eiq9HI6lQmvvgmixj2TqsuoPv8PJXLe2+pd0iYUsRcmBiHoov1PlL /xaWZv8d/JQ3U2J2JoRdwbk+pCm/Gk1zz/McNIV6yzeEm29os5m7rI3MF/B+ITKpBHiy IhlchgnTXojiu0IBJsg+/6ql4IX/5QEghj2l8vUc4SJrwKjuUGl+vLhYbImrmWco/YIn 2kmBN7bMDjK50Sj2NNJXylO8VIvKLe1rgBN4awpcudO55UWHHmFwv7OepKwnfijkoIe1 AJXw== X-Gm-Message-State: AOAM531jPv5zJULo+1sYIhS1TmwLxSu66IcppzuR0FkkOXvU1wy+YbKN d+ro4x96Xc3QXprLf4siYdjQwHpn X-Google-Smtp-Source: ABdhPJx6K6bICikvGGkvpAyT/t4Qf3XIOa5RwenSF+eJwGGS0eqdNbt2W9iYgoou6RQp1DgZYIyPZQ== X-Received: by 2002:a5d:5084:: with SMTP id a4mr16595251wrt.191.1595763679079; Sun, 26 Jul 2020 04:41:19 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id h199sm14068068wme.42.2020.07.26.04.41.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Jul 2020 04:41:18 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jul 2020 19:41:11 +0800 Message-Id: <1595763675-1857-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,