From patchwork Fri May 28 18:48:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27975 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp801737iof; Fri, 28 May 2021 11:56:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuMSFzn5ImJF3SmTPuELtUWopAz/S78GNj2DsdVAKpafepFSRbG3Kbu/xX0kP33R9WeqEW X-Received: by 2002:a17:906:3181:: with SMTP id 1mr10655524ejy.36.1622228163798; Fri, 28 May 2021 11:56:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622228163; cv=none; d=google.com; s=arc-20160816; b=goON+oE9FqX8+0NQFd+uRBUi1LMYyhUE+gE74DPURyCu2vjaMJYKEpkg/3YiVixaDm PlGyqaIfVnllRGCnnDrMOjF1iPlmguJxg6qlaZgyYuwrQcEAV1BlJoTxtgIWmfZAPLAg AjVYnhS3r97Rnh8me8w0XTP+Vwezj6QlcGgVnu7nk42Rp1wIAwXyYlx6mM52eTyNQQoj 0yQrTrlsxJB5oGnZJQaae+AHgjBZii1rdrFaaG2CtcH3T409lZBLgejhGowxGnsxlgBl Dicxx1SFMvt+ok+ligKUAojtMoz66Vc3XSdX8K5PwixYNMU51xCv/PYqZf1E6nwXZA1L Q12g== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=9j4mTHDKFOHayF9t7a6KY0JScB5SIaXKJxyN6OW7zrw=; b=IU5gOybNDqhe7WEFskQkyY6sz//1UVyTlA9GTWv0BDRHxbb7GNauTX0GEQM5ajMViq bfGuUHwIIx8spFr30Vi65iyWZtZMr6MaZoMIiqTtH5Yug5wcD+XDK5fsF2NT3y+FceXT 3FPutXrr0FhByepo29rWWpDnyoWixCZZc3+mNTtLlpxIX1ZvN+oEdYYUlicMa2pjX7ui V7DYnA8tCP6DbmFd1PVtExcRscNzM1F2In4l9lFjrnvL58FYizf2uQp+PlIjWUh0WZyf 9RtQor3AsjE88sYnMrPU/Wuc+N+WgMPhkTdKCzgfHJHvXgtB/KPPE4kspnTSsxDgTjLL 0n0g== 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 f12si3575260ejd.429.2021.05.28.11.56.03; Fri, 28 May 2021 11:56:03 -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 1FE3E680B71; Fri, 28 May 2021 21:55:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17AC6680207 for ; Fri, 28 May 2021 21:55:50 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lmhY6-002Re1-0E for ffmpeg-devel@ffmpeg.org; Fri, 28 May 2021 20:49:34 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id mhX8lu3HdljeHmhX8lG58T; Fri, 28 May 2021 20:48:34 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=opWBsYQUGbQX8mowUB4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 28 May 2021 20:48:32 +0200 Message-Id: <20210528184834.4625-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfObS33MfqG/b3i3t+K5zYvuYNK7i9O78riDpUcCtmgmQ5HujqFEXAJj396Mi4bwtgLaXAinN4DVjD7T6m8zbFLFioG+Nd91PKdEEzr61zxzELMSjASd1 /isV3hm9H100qOFNT8ZejzhBCkGfpul9KBBR1DDCaNo1qEZMPmk8Suov Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/ratecontrol: Avoid floating point division by 0 of mb_num X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: C+IJZCjNuN6l Fixes: Ticket7990 Fixes: CVE-2020-20448 Signed-off-by: Michael Niedermayer --- libavcodec/ratecontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 6b77ccd006..aa146730f4 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -241,7 +241,7 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce, RateControlContext *rcc = &s->rc_context; AVCodecContext *a = s->avctx; const int pict_type = rce->new_pict_type; - const double mb_num = s->mb_num; + const double mb_num = s->mb_num ? s->mb_num : 1; double q, bits; int i;