From patchwork Tue May 1 20:44:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8737 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4952141jad; Tue, 1 May 2018 13:45:27 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrNiYikhTOock4XFj5wUUGsLLDDnP6906M1dbPO4Sb4wfIZBhd/5dTE+Fz0TNIxNTUZx6Sf X-Received: by 2002:adf:b3d7:: with SMTP id x23-v6mr5336944wrd.142.1525207527367; Tue, 01 May 2018 13:45:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525207527; cv=none; d=google.com; s=arc-20160816; b=EMc4CsS5S6zcKQnlu3rgnpg2NppV4b/+UYbl4Lc3CdIwwQs33pNHI9X0dRCYru1tIj WtdGHInZ4vd3GjSmDDwL0FOIpK3Pk2CiXvakapm2e4Q2amwMO1KUE7v2o43UNesNiGk2 lPtjNaaa0zYkERt1Cl1VBPkJhWBsUhljdkSirFDbTIE89h4zQizsjGFSZ3wvuU2R12Xs DipG6gv+Ta3y1ZVK2/EYFB/XZjk45IfyXNSKDh2iPm9muUzNHzQj5AWCOgDQFdQjDEQ6 pWqW+PYk13qCZeMLMP5E0SwktkOKU/d6SX5teA/kDKc/8w5sTpf/Sso+FQEzQ3lZPrm3 e67w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to:arc-authentication-results; bh=coqCZNT6RW6JdU9hfmMn5J9AKtwarzqhk4DzxQsfn+A=; b=jAXElpugcjpm0NcBOcSXPH+x9oE2/6bVjwEuuT8t4k1m1x5LNEyIsTZjdTQF2s9u6U KXZt95BkWAz7IOTVPFWAnasysDSvqpcPPVN155NkMakI7NN+HFgU0hxhKuNK5FrK9tXI NatZQfkHGjweqQyKPomwx1LdTAuwMm6ck+TjVRjCiqFUKHswmX5P1Qg+PqRBzNWZyPBd Ipofv47SyP/Eq306SKQLlmx94QRMau6u/Ha40r0ZQnX9BD9oSt+OFSSbjkwBlt2HCPkc pwbYj8RH4+RvJfd1fFc1KRlYQfHT1H8kMjGlMwsJqBsT6KM8JvD2diidBe8sFLoJ1dSl wl7Q== 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 i90si7535953wmh.63.2018.05.01.13.45.25; Tue, 01 May 2018 13:45:27 -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 48E81689CFA; Tue, 1 May 2018 23:44:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E096689BC3 for ; Tue, 1 May 2018 23:44:50 +0300 (EEST) Received: from [172.31.218.34] (helo=vie01a-dmta-pe02-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fDc9K-0001Qg-PA for ffmpeg-devel@ffmpeg.org; Tue, 01 May 2018 22:45:22 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fDc9K-0005a1-2B for ffmpeg-devel@ffmpeg.org; Tue, 01 May 2018 22:45:22 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id h8lK1x01G0S5wYM018lLGL; Tue, 01 May 2018 22:45:21 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 1 May 2018 22:44:07 +0200 Message-Id: <20180501204407.769-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: Fallback to duration if sample rate is unavailable 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" Regression since: af1761f7 Fixes: Division by 0 Fixes: ffmpeg_crash_1 Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer --- fftools/ffmpeg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 5dc198f933..15fa54f24e 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2706,8 +2706,12 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo ist->dts = ist->next_dts; switch (ist->dec_ctx->codec_type) { case AVMEDIA_TYPE_AUDIO: - ist->next_dts += ((int64_t)AV_TIME_BASE * ist->dec_ctx->frame_size) / - ist->dec_ctx->sample_rate; + if (ist->dec_ctx->sample_rate) { + ist->next_dts += ((int64_t)AV_TIME_BASE * ist->dec_ctx->frame_size) / + ist->dec_ctx->sample_rate; + } else { + ist->next_dts += av_rescale_q(pkt->duration, ist->st->time_base, AV_TIME_BASE_Q); + } break; case AVMEDIA_TYPE_VIDEO: if (ist->framerate.num) {