From patchwork Sun Jun 18 16:39:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 4018 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp561603vsw; Sun, 18 Jun 2017 09:39:54 -0700 (PDT) X-Received: by 10.28.236.134 with SMTP id h6mr12559582wmi.1.1497803994804; Sun, 18 Jun 2017 09:39:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497803994; cv=none; d=google.com; s=arc-20160816; b=NDTC+DNz2ltaRn1zOGZDpxg0HN1U+s4jdywiDYBbQ/MsazSUXv5HprbkmNDw30YxHA nRlWObqkMLO5PMbjK8YImffd2j5GgEuNNh1pzutDN6espaoXv2WeqbLInHPhBxjNb3VE lSoAn3Ah699Ql6BQF64wZi8fWp6N+x/DVJczy3F6K2KZPvi4Z4RcsXtsQ5kH6JiXgKDL nL0ybB9/s2gvH/orbSyo8VjsYqTrgbY0E+oSjt9BfTzDZmavOt7SDkph3Vx6WHo2ingL Un/LCQv2EtvAFW0cM5Bdxoun+QW4ri+jAaIPJ5fFwfhjdEXIg+A7DkIGZ++Fd5M9xqG7 rqmQ== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=ly1Vdr/Ce4qIxzTMz1PJKQkXQlaCJrZR+ZPnBZSkOj4=; b=bRUNXtOnUWFnmPVzRZd9lPfgh6RAGXh8OOlkzPqr9QGtP7eJ7a+l076xuuT2dH9ofa O8rIp7PkfHls8QJYqgHOsArMkjvpyAggyGHu1vNnvgnoCmbOseQoCroMDHBjIzkWSZQT VomPqo3EMjbKsR/cWNv2Mqv831DqaHRafLboQREV4EnxZmzav+7KiqFwRWyGX5YCiFuM SomOFXhrbjl3Bqon6xFLdZ1N1u1Gm5TVp2B9HRzRbmhriRCOjGyDw0OyqnExVf5N8e+v /8snmlf67HFETQzOy1+BiJ0HWiFvXP01bwaM6/gZOfiCXVD2mIpGsqLST6P7iuA3e5fP TQOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=P40GLJ77; 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 k184si4399505wmg.139.2017.06.18.09.39.53; Sun, 18 Jun 2017 09:39:54 -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.b=P40GLJ77; 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 57C7D68A12D; Sun, 18 Jun 2017 19:39:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58BA068A111 for ; Sun, 18 Jun 2017 19:39:40 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id z45so10920578wrb.2 for ; Sun, 18 Jun 2017 09:39:44 -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=MuhXJHi6LacwR1IJVIDKn54NGx0GEGOsF7Ltwp1kq2w=; b=P40GLJ77eD6eAX/tqceljM1pU4aNcDp4+c/pvl1nX84qvWHnHeANOc+M18HmfJD2UO VX9TwXND3ZlRG9sBF9LtF/0k5diG/X2jst6UPDEtSks5HJNfPYUKiZPkWPYjwPVEfp44 64zmpA8pos8clEUHVE6+HBNDoGn/fhAGmYM7/kFgkxZ5WpqwN/rIZb18iQPq4itolkvl co3W1c0Pjr48wMYPq6TUPDWLL6uAhX8pec87rfSiYQCEFkqXPbr60peBZ6E7/eVC11jU PWkF1fEdlcDZv7wpvGXGt2HCk6uwUTd4Gm6KfcYiUhZ9nwt3Q2PzeYdQqGNnpiD6vQ0S fQLg== 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=MuhXJHi6LacwR1IJVIDKn54NGx0GEGOsF7Ltwp1kq2w=; b=TjQYMcvJnATXbcdcLCSzsLBmDqGBF6JZvRHgDj9omAxriT9AnTFZDGOm47bEap7n4H h3DjhKnHEF374IoBh9EgNkJUSJYwVFgdilnCesUb6SG6F1oQusCnp1iCEIqmGucz7T35 4CED9G3P07KDtmR9KiHjCSynDQ0pmLorQ6N6mVcNs05aYuzh3DBqzjAuvDM8tqg8FuYp qC+eLXxeaod9gprtSaJMJlzRbm8fw53UzhUBO8o07wAIM7QzaBL+kK14fevlT+DOOp/8 PWllDXMT0xfRt/ZM6qoPDZzxLJpb5FvY1f03btPSs4+w7ZHBQe8UNBkXsygmoJ3e818k EPug== X-Gm-Message-State: AKS2vOw5wWNqEuAwnIxCmlOJz0mfMJKi11ZIOB2yg5e+piDxF0DFaX8y mGXeLAY8MJ2LHUKb X-Received: by 10.223.170.193 with SMTP id i1mr12553403wrc.143.1497803984099; Sun, 18 Jun 2017 09:39:44 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g2sm7021660wrg.69.2017.06.18.09.39.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Jun 2017 09:39:43 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jun 2017 18:39:33 +0200 Message-Id: <20170618163933.31389-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avfilter/af_amix: fix possible hang 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" Fixes #6424. Signed-off-by: Paul B Mahol --- libavfilter/af_amix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 9fe505b..e06c753 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -288,7 +288,7 @@ static int output_frame(AVFilterLink *outlink) if (ns < nb_samples) { if (!(s->input_state[i] & INPUT_EOF)) /* unclosed input with not enough samples */ - return 0; + return ff_request_frame(ctx->inputs[i]); /* closed input to drain */ nb_samples = ns; }