From patchwork Mon Jun 8 13:59:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20218 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 1772844AE7C for ; Mon, 8 Jun 2020 18:04:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 014A168B1AE; Mon, 8 Jun 2020 18:04:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E0AC68AE41 for ; Mon, 8 Jun 2020 18:04:43 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id t7so8887050pgt.3 for ; Mon, 08 Jun 2020 08:04:43 -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=PzZKDGVUwYF51Ulfj3CqPCPMCQhsPXmVzTzhfwz/mRA4eevyKXnl554q//u7FsvyO2 N76CDwkty+8j/Q+xdfzPMFO9WSazBVInymzmFk1M88BB3G2bT6tO9Ax2HSIsd9JVFM/J ANV7ts+8syhxNf39FZPc1lNZhMEtG9ZIocKPMbNeHfiKeG6MGPRY+lAtXeoA1V8ZNHro TLcWpv7DZ+cmtNWQQQW/0b4Sol6HlXcHQoAKEbeP6kwNf0pLRDU8Vcz83JwJvuLDlbrM xrcjP/6U9nnc75vrLeEIjRsCd4DSPRIgCVvNmOaZCkIEaQQl/1AHi3N3qTj0ggsaesgt CT/w== 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=PheG9lzXyx+h8G4lFrcaSFpLYxkhG+TkaiQwAQYHMYEMAy0OfKvyKxC2rZ55EyvL0J HghV83DaDrn63kgwgjENjTZnRdJNyIZr7IB6rzbuzdRUOgYXRjp8qT3jafw0iBQU3wYO SSQlLw00s7L6EpCW2XSt3K3khX60zEMNG0vjCiUFhsAUrMPVAFpZdl6CNHjbyu4LGN7w OlFe1PrSz/jHECHhFOKoUhKJhUX9zX7XbgG/v7zZ/ClT/S+RF1RK8IeAVK9R4nis8jzd zAiYR4p1rFvkrL1XiH1QwpDNBkUGBj3G1qQ/e2BnS6aacrubL2sTN7DGT1GnOrP/UXyN i0pw== X-Gm-Message-State: AOAM532bbvRC+ngsyCRrrrgTv8UDMDjK13F2SZEFNuCc4udhc8cV8dlX mha7V09TILSagTOSjl7hwo9e7YoY X-Google-Smtp-Source: ABdhPJxwl9TKF8bQyya4etmdvFl1DDSCINaf6aHt+h7pk+I6ToBtrochuZ5v5lYidJGFG2cpxNJRAg== X-Received: by 2002:a63:3342:: with SMTP id z63mr20487623pgz.49.1591624795637; Mon, 08 Jun 2020 06:59:55 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u14sm7634721pfk.211.2020.06.08.06.59.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jun 2020 06:59:55 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jun 2020 21:59:49 +0800 Message-Id: <1591624789-18033-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;