From patchwork Mon Jun 8 15:02:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20217 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 B1CDB44B492 for ; Mon, 8 Jun 2020 18:02:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E22468B010; Mon, 8 Jun 2020 18:02:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A99E468A315 for ; Mon, 8 Jun 2020 18:02:47 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id 23so7764835pfw.10 for ; Mon, 08 Jun 2020 08:02:47 -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=l+OlurJQIuUL9qvBRjbA01wZGb7R7tWhuFTFrvzfjrM=; b=UXjsFmmnw2+m2ZsmsMxsVB2Qql3jH1OG/PjMqdSlCEd7SiuAcrtP8cDsW0V9wsTcn+ GSjoVuxTw2neW3Hwr9ehlgQYPA92Or6VH4Imnmkq7/teYRejr8Y50ysw99VxDCqLFfl6 cCGYruL8t7Lm+9mabAvw/rgHFGfz8FBHwLas9C871E7d9xim6jZJamAAHDMhL736rG7h vrApNCSA7udQTofYFXZ/VP8zNBtDDymxl+b2jyM9IYXU9txTFp/+xnhNMOUuPONWaaUL AxLVFi1yVEeVl8JnNuWOiLrzhvsPS+m966SRPcWE7oxU2IYI6VQB+2irMnAWrwxrxlNv luJQ== 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=l+OlurJQIuUL9qvBRjbA01wZGb7R7tWhuFTFrvzfjrM=; b=kT3+xUvMVVfq45mqQ4nhvxpc3hW442RI5SKwavsC3Imgc2/6SD/J8yoFyG318Am0e8 xAKGtoKAn9jlVXywQdfUUBswHJd/WNLMX2PcOjDWeo4Rpr7Z4UzoEpewpiF3U9xFXPem tyKEvcKfxg+53hcqjk9YNjM8Jpn8e3CNP+/dlc7g2J20lA36vKVBIuzHgY0WnVWu0COM K+Xk0lHmX3s4KltibVnS1Ix7DnkZi514RtC92eBuDyZ4av3WEPhFlqGtsMr+WPNxrFgp F4/YJWFWHu9mw97gCzsL8qBFABLihivMoVXJlDsjpLvajZeHiJiS79ggFApDw3q7ta2V VQbw== X-Gm-Message-State: AOAM530BaVIroyw2nUPbCI7uVDlxniesWs6v/PRNp8/q7f4ZTaVmaMWA EC7DGT2B9UvwDqlCAzLkXQheoczW X-Google-Smtp-Source: ABdhPJynLrw7L8nL8J6WIu8WZm87wtMz6x4NVSD3cdvwZRtOj2nwPN6Lp6qxiauE7x+p55RWNSjcDw== X-Received: by 2002:a05:6a00:50:: with SMTP id i16mr20971117pfk.25.1591628565034; Mon, 08 Jun 2020 08:02:45 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i67sm1071111pfb.82.2020.06.08.08.02.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jun 2020 08:02:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jun 2020 23:02:38 +0800 Message-Id: <1591628558-23484-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] avcodec/libx265: Fix integer overflow in computation of max and avg bitrate 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/libx265.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index f560d7f62f..686c205b6b 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -310,8 +310,8 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) if (!cpb_props) return AVERROR(ENOMEM); cpb_props->buffer_size = ctx->params->rc.vbvBufferSize * 1000; - cpb_props->max_bitrate = ctx->params->rc.vbvMaxBitrate * 1000; - cpb_props->avg_bitrate = ctx->params->rc.bitrate * 1000; + cpb_props->max_bitrate = ctx->params->rc.vbvMaxBitrate * 1000LL; + cpb_props->avg_bitrate = ctx->params->rc.bitrate * 1000LL; if (!(avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER)) ctx->params->bRepeatHeaders = 1;