From patchwork Thu May 4 23:32:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 3571 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp775166vsd; Thu, 4 May 2017 16:33:04 -0700 (PDT) X-Received: by 10.28.55.9 with SMTP id e9mr3480928wma.44.1493940783926; Thu, 04 May 2017 16:33:03 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m88si3052527wmc.78.2017.05.04.16.33.02; Thu, 04 May 2017 16:33: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 D4701689A0C; Fri, 5 May 2017 02:32:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe07-1.mx.upcmail.net [84.116.36.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2EBE6899ED for ; Fri, 5 May 2017 02:32:44 +0300 (EEST) Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1d6QEr-0001Sz-8k for ffmpeg-devel@ffmpeg.org; Fri, 05 May 2017 01:32:49 +0200 Received: from [192.168.1.3] ([80.110.87.46]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id GPYl1v0090zzTA801PYmRj; Fri, 05 May 2017 01:32:46 +0200 X-SourceIP: 80.110.87.46 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Fri, 5 May 2017 01:32:45 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201705050132.45109.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [RFC]lavu/opt: Use && instead of * in boolean expression 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! It may be better to disable the warning. Carl Eugen From ab94367f502ab00f643a78608593eb9522e5c3be Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Fri, 5 May 2017 01:30:19 +0200 Subject: [PATCH] lavu/opt: Use "&&" instead of "*" in boolean expression. Fixes the following warning: libavutil/opt.c:101:47: warning: '*' in boolean context, suggest '&&' instead --- libavutil/opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 6f87078..df88663 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -98,7 +98,7 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int { if (o->type != AV_OPT_TYPE_FLAGS && (!den || o->max * den < num * intnum || o->min * den > num * intnum)) { - num = den ? num * intnum / den : (num * intnum ? INFINITY : NAN); + num = den ? num * intnum / den : (num && intnum ? INFINITY : NAN); av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range [%g - %g]\n", num, o->name, o->min, o->max); return AVERROR(ERANGE);