From patchwork Mon Sep 16 15:55:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15104 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 0B17D448C5D for ; Mon, 16 Sep 2019 19:03:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA6736881AA; Mon, 16 Sep 2019 19:03:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BF376881A8 for ; Mon, 16 Sep 2019 19:03:30 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id b9so54410wrs.0 for ; Mon, 16 Sep 2019 09:03:30 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=fwovCIOzYY03TPZ4J/FCzJ6qwNDDx30vkyuUhLqN6tw=; b=XauCjhKVhkOAs4IOud/KSXvr3SICtU6D3Rq1HN9nYQjDz92tD48/95NX92T9hlydTb 7G6wfrMLaZ3ep5wbDumBjFRjnpGTw2MzHfqyzV/P4Kd1Lw+wz/AMDUPMs85Jvinti1or KZhXUiI/Pe2/ZdF6aO4ycJr7gtrYHoY+8R5u4PoEeUNuco0M38Il0WrEL+7Kt7PkNA6F LPWgHFG6vHifEhoZMwsksa0Vv0TWSuJ8t5U1TLVvLRToe7+ysTjFP3h99JT1oSvFee7Q 3434WJjfWsGjq2vcxqkHFQPjnfbM7KpHZaQ8jvJEWNy6+9yqF5QTij0+mVEj8rpDGSCo ivtw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=fwovCIOzYY03TPZ4J/FCzJ6qwNDDx30vkyuUhLqN6tw=; b=oYeAS74NkdPtw8Fb8vgqiIyHUweWN4H4mEjFGg0G8sYoqH+arzI+Q21p+bXgVvehN4 wIU+f91Shec8O3bVmWqqPAEoDMBfr9KrQy6Absb47NJ29QUGyCXfff2u9NYtFXTNNzLz +8pqxg6yEswyPV+iRG+zpRRa5CancGvyPhfE73qIJkUJ2sPng7vYBGsYsNu7Aa++AH2g JtVVA+vBXzRRkIkQXMwF8oZuKaTULwh9rdHRcGxSmf3AtacHdNxuHsyIfV2lkYWn4B8+ phOqkasKTgx9V4wljlR9RaBoLxDKaGL4vjp7ht30v0wRLhnTFCun/HZT4wq9uhucaEKB JdvA== X-Gm-Message-State: APjAAAUjneSOdGOovCdfCG4vRZcwvf9+VdNa73fTf25MGjQkULu34WU0 X4cDBKM+jGDUkCKJkxm9eGiXiw7Q33E= X-Google-Smtp-Source: APXvYqxXsYESZZlb7o4yeBRgcWv7hJr7UuVzHjUO3KUNIJaF+UyYBPSQcEE7jw+tVKBBGgiqmma+zQ== X-Received: by 2002:a05:6000:a:: with SMTP id h10mr403250wrx.226.1568649809814; Mon, 16 Sep 2019 09:03:29 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id d28sm48111628wrb.95.2019.09.16.09.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2019 09:03:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Sep 2019 17:55:01 +0200 Message-Id: <20190916155502.17579-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190916155502.17579-1-andreas.rheinhardt@gmail.com> References: <20190916155502.17579-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] fftools/ffmpeg_opt: Fix signed integer overflow 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes ticket #8154. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index f5ca18aa64..b2aa63e7ee 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1,3 +1,4 @@ + /* * ffmpeg option parsing * @@ -2769,13 +2770,14 @@ static int opt_target(void *optctx, const char *opt, const char *arg) } else { /* Try to determine PAL/NTSC by peeking in the input files */ if (nb_input_files) { - int i, j, fr; + int i, j; for (j = 0; j < nb_input_files; j++) { for (i = 0; i < input_files[j]->nb_streams; i++) { AVStream *st = input_files[j]->ctx->streams[i]; + int64_t fr; if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) continue; - fr = st->time_base.den * 1000 / st->time_base.num; + fr = st->time_base.den * 1000LL / st->time_base.num; if (fr == 25000) { norm = PAL; break;