From patchwork Mon Sep 4 02:44:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 4969 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp2703814jao; Sun, 3 Sep 2017 19:53:17 -0700 (PDT) X-Received: by 10.28.52.140 with SMTP id b134mr3097899wma.111.1504493597400; Sun, 03 Sep 2017 19:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504493597; cv=none; d=google.com; s=arc-20160816; b=pKKz7Fl4B+o9zEHQFPpmg7Q8TjY1dKwxYaAtoR3i7Bui4c8oQZm883Pc2JI/pbJ8gF B5/hd+MGP9S3rAKbAtBDvrbBR9gi7CbRTvIEDCo21/AWif/QYwxhGweZ+hnXDfg0qzmf 7dvzsdiKdk1ImjG4ufiN7ERoOiU50hR0+onOwqw1qqSGClpUzNGF5BMkpmZvK2gHHf4I 2/zfiPfQadzVSoIDlvzz8XnAyLRBHHCou1z7aCguSoIX8oBi7kB3H9kB+afb8gBiMnlI nZGLNmFk29WWSwI46h5lzoYrrzz0tE7QhHI3hCOIpjcLKKXoz+kfBT2zLLlUth7FNJVY KqHA== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=9i6VHTArgtRCy9Sn0o89Vy6ZBq9aV5Qs8j5b6Fccflo=; b=PRfh78BAV0FG8DThLsaIaEUIxBaOKeskDQdpj6BeBuBfGVoBZyt3eon0/IH18tKRBc aZ858sO/55EHr1NIHDQlQ45gbm5OwEVfPj8cqT5Z7XKmHfg1aMoSeeqdR5dY218d6vQb MPOaMosnw5cJLsE77jZwRJTjHXR1bCIS1Ju/RTHPrDwtt5IttogFnRa5OmCn1g1J0Ip4 ly21jjgBaVtOdbNEbXAsFMsH7fPqp4RLw3ewVeHjGp9WYKbnqYe8gmEfHaFTVWzBNdNW AwR8+Vlzo7YIMwAFS2a6QmCW7PpTqOD22aZ4nZpc/zyLguxN/M1ICyG9gTEsGM0MHPuh Nq7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=o9nHV9Be; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o105si4365099wrb.237.2017.09.03.19.53.17; Sun, 03 Sep 2017 19:53:17 -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 header.s=20161025 header.b=o9nHV9Be; 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 AE90768A1BB; Mon, 4 Sep 2017 05:53:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30B37689D29 for ; Mon, 4 Sep 2017 05:53:07 +0300 (EEST) Received: by mail-pg0-f67.google.com with SMTP id 63so3609340pgc.1 for ; Sun, 03 Sep 2017 19:53:09 -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; bh=F1eT3n/FMD/bT+j/kZYYSFVYkx45uX2rVUUSyxG34dU=; b=o9nHV9Be9zCfalgRmIJHGgtfi/HLNf8iecvFmVBszmCQ/r2WVKA6YLggOkE7qbT7GT RVaRukbvVl6X/JhdehoRGF5xlqOiQfxcWL1eK1zHohd8hZ7mh+yoci4s/BY3Y5zfPFZE FklYchYPCTHnM0TbNRrO3ttbd2j7EChT59oK9ditOb3/Ryc2iEmyGFlsF6LpVGlDumQ+ BCtAgrUoqszOFxkgaKZVFgDpOBqOFDbkC4eaYuwIcnl5vYvT2LolN1xJq/cvFIxv4PJC l2kPj2UwVCV9EjvThJPfGBrxQZhLMsrtEY8skUoUk5eY9jbl/LYsBo1Ag2KiPaoamxX/ 47TQ== 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; bh=F1eT3n/FMD/bT+j/kZYYSFVYkx45uX2rVUUSyxG34dU=; b=LlRLbPn336jD/AHfKDANTVteTdeor4ZbSGLFPZkdtsphvh8xUtEl5qZr7yEOHJ1mfd vR4JkhyoQJXCU7dWMv6sTXsmZGv/2EUY40dataqvkTULx503BQRERP1bKXWh1/RfdP1a kaKSr/Yxm2bM+7S4Oaxg6ZyYDkU/3/iQbpTxdySNDp5n9vC+3v9ddBdOu5EXvxkDUUus LmxPTXtIC8VIV4ij6ksOhCwChQp0Kn9zCoFHpk8L/EXBI+415GEn64s6ZOx1NRdJjjXj exOUIcnAQrglomppbDbhnZyFIP8BUGFtfKyg1pyImmTyUqk+btxgAW4rN/8kQf+5DQsq ziKA== X-Gm-Message-State: AHPjjUhr+u6MBRrj/pqrzp1O9uxUx9F2dYOOGWq6k7z1P8wDBdOcIAHr 29/Kl3L84tpq2p/m X-Google-Smtp-Source: ADKCNb7Ic+aRGzzlzfpjvh/FaIYgI+dPW+sUYh/DPlLscccYi+W8wDrRshToF131xxa9zjs7rClM5g== X-Received: by 10.98.18.129 with SMTP id 1mr10014686pfs.86.1504493100545; Sun, 03 Sep 2017 19:45:00 -0700 (PDT) Received: from homestead.aragog.com ([136.60.170.51]) by smtp.gmail.com with ESMTPSA id 74sm8430974pfo.74.2017.09.03.19.44.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 03 Sep 2017 19:44:59 -0700 (PDT) From: pkoshevoy@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Sep 2017 20:44:30 -0600 Message-Id: <20170904024431.19112-1-pkoshevoy@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 1/2] Revert "lavfi/atempo: avoid false triggering an assertion failure" 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: Pavel Koshevoy MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Pavel Koshevoy This reverts commit 4240e5b047379b29c33dd3f4438bc4e610527b83. --- libavfilter/af_atempo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 944df1dd32..9eee8a63a8 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -914,8 +914,8 @@ static int yae_flush(ATempoContext *atempo, atempo->state = YAE_FLUSH_OUTPUT; - if (atempo->position[0] >= frag->position[0] + frag->nsamples && - atempo->position[1] >= frag->position[1] + frag->nsamples) { + if (atempo->position[0] == frag->position[0] + frag->nsamples && + atempo->position[1] == frag->position[1] + frag->nsamples) { // the current fragment is already flushed: return 0; }