From patchwork Tue Mar 21 02:03:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3038 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1660983vsy; Mon, 20 Mar 2017 19:12:13 -0700 (PDT) X-Received: by 10.223.177.151 with SMTP id q23mr27517192wra.65.1490062333716; Mon, 20 Mar 2017 19:12:13 -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 h40si17878519wrh.7.2017.03.20.19.12.13; Mon, 20 Mar 2017 19:12:13 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1235C6883EB; Tue, 21 Mar 2017 04:11:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74EC56882EB for ; Tue, 21 Mar 2017 04:11:46 +0200 (EET) Received: by mail-qt0-f194.google.com with SMTP id x35so19805305qtc.1 for ; Mon, 20 Mar 2017 19:12:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=6XhxfDZFtyiaVnBsBCfrQ/5Yv6oFxNzwITQBW/cNmfs=; b=I9h6w1e2uvtv0dH01j0Zn/CYvRICxmxQYItMXQq3/yLA+KBHPdpZ96lRPhNZgglM4T 8B/rlbUfDl+ELp0YeZP9dFXaN4akLA/oRV2DEayx+cPMFeplchXEmcj/Tj412fp2JjCW 8M8uyQu8MY81nrHvNEtOGSOmvzcyBrxnRSu0fLVmSMG2f8gYk35HzXYKhnGsmCcFgjTs KSu/XYNDOSsASTPW+njZ+juAA4Z5vg8NhGjPQq2i9tcj4cnTEdnqzqigPU1+5L3DbVsR m2G+kd6wA47yF7X4E2+BqV6A5IrmcmQOUx3xJURbgyW588FPGaTCO2LZxuhG7ikeTqGw +lTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=6XhxfDZFtyiaVnBsBCfrQ/5Yv6oFxNzwITQBW/cNmfs=; b=sF0P18Iw8a95h89Cy4EiswunVWlqXFsMyvL70elGI9okd7qaSh9aqXgTEzmqfXBRpK 9xNeNkkd0EwbzdQgoKp7k23sJFdpZm3AfRP/RHMcLQkCkPWN1nyRUGb0++qDRUHlvL9F GkPK6RYk7OrsAHNX9yXE5qEoZIjB2Ou8z6g7PpT0hCV6Ye66F8dPfE+VUBVlvtrBAy9A h0BfgU6lqaoUrIlnCsyTrsSD7O9xYZ0dh7KD6eBxR4fPBrrIEkbYyEXjr+nDUI+qZVRl Ncu6UxYg0sY+AxSbyU7XSCfCAbWJ7gVUzCiihVtP3meNugMH/jnpTnoaOXYcXbxQ7e69 /ikA== X-Gm-Message-State: AFeK/H3PY+bCt3Ma9TWgokT3y3DiNU687kwOSVHsb+r6Va8AVb1lMe2wZS7l22FretcQAg== X-Received: by 10.237.60.65 with SMTP id u1mr28174912qte.176.1490061826342; Mon, 20 Mar 2017 19:03:46 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id x19sm13708369qtc.23.2017.03.20.19.03.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Mar 2017 19:03:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Mar 2017 23:03:22 -0300 Message-Id: <20170321020323.6136-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/apng: fix setting frame delay when max_fps is set to no limit 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/apngdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index bb17896ee5..7a284e32c2 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -269,7 +269,7 @@ static int decode_fctl_chunk(AVFormatContext *s, APNGDemuxContext *ctx, AVPacket /* default is hundredths of seconds */ if (!delay_den) delay_den = 100; - if (!delay_num || delay_den / delay_num > ctx->max_fps) { + if (!delay_num || (ctx->max_fps && delay_den / delay_num > ctx->max_fps)) { delay_num = 1; delay_den = ctx->default_fps; }