From patchwork Mon Nov 20 13:03:14 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: 6225 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3878925jah; Mon, 20 Nov 2017 05:04:31 -0800 (PST) X-Google-Smtp-Source: AGs4zMaUzk8lV5shTC6CWLuoTqbFWqdi5GxIAVdQkwVhelLLd/NuLWsQkiYuQb4h8LfwKjkBbm9O X-Received: by 10.28.157.7 with SMTP id g7mr9859608wme.89.1511183070913; Mon, 20 Nov 2017 05:04:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511183070; cv=none; d=google.com; s=arc-20160816; b=DOjkOrPMhNo40eAZWisDPQjf83nEpoboW/XGnugVOaxJsXLV/w6iVb/6713Z20X0NY mxp22jXMENUVqBadW+W0rDhaAsHMmDrcsQYUvAs+Ihb+E7FFhvp+UN8OkxIZvPC5qiBD dPJvN1zq+CP9fWIZkmmdSNepAms2HmOAcJFA/YCezUstrW9CFMRDl90tzOU+HSAbFyqp uRPRZvk619VceR+NbRme/6JancGvJ1LI9acq4DmZq36wwv99ixmSy9dkhovaaWMy1AYH oM7xagG0vKSBh1kQvwHLLKjEz4DGzeOBFCTEkh4EQRx7rNHMbnuIutNO4wgDD+Qkxlp+ 5sOg== 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=g+oNWHE5rFdzrN6So8/4QKjVwif8an7errhK5zxuvXU=; b=euzPi9QOT23D0F6l65vX0gFlGxtiVrA/b0i8LVwp4Q3jr5VA8u5dznKW/f5oySp0ff Cl5lVXIOJgbSuCXJvEV+mU6f3o0Ith1pZfrgDsrITkFds7aMeGgcKLW3d8OFiEkL43vB y35J9nWf5UQk1I+M0C37DSA7QtRVhr10TCF4DOQyXROnDdfQ6AehM4tYA5fopLKI1aph JsOPtb6DNOkyxVNjf47tBJqMSQ2ILNLWt6rxT8hPILjThTTXXfbVaZBSA2cQb/yuWkRo IWM9coXOHlQ6l1hFyP8BTXD4Ky0JL4wFqZKiu69Qemh/VX9toJ9pcowLNaDYV8HWhXtq Ggig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Nfa/k1v4; 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 f7si7425134wmd.196.2017.11.20.05.04.30; Mon, 20 Nov 2017 05:04:30 -0800 (PST) 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=Nfa/k1v4; 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 28D9D689E2E; Mon, 20 Nov 2017 15:04:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A864689A91 for ; Mon, 20 Nov 2017 15:03:58 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id x63so18644755wmf.2 for ; Mon, 20 Nov 2017 05:04:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=OyAfr39Wod5Dq/+LVyGkFwxQ1BUEhwwdo6kPd/DykbU=; b=Nfa/k1v4XGs6FdAh6PJ2tYMtvq9LlTru34LqnorCRAwuwwG3xy+xNrKopBvJHq8EC7 DdvY/u1xlBdrvkm9Lc8lB+nt6chYWEm5OvKT0HVxqTKcqZSAqrO6Es+bMiHydVqGBTNB RHFOC77Q5sIUbq9jZhlHuEv6c5ZR9J6ZIb+rSNwpKbCO1ONGhM0SuuPtsr+CHewvcU7m H0DzlZhygAUT+g8vcBqCIwpc2JF7Df1DEo7hDPBudAJ937TwshfyRNhAngrhwKWQWkQx 6Hqg8rjzHCpSIeBv19yND61PSUzhK04HWEuIe5QXB99CzyGT+uHz3TYjQF7RlXFPX/HR Calw== 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=OyAfr39Wod5Dq/+LVyGkFwxQ1BUEhwwdo6kPd/DykbU=; b=ito5POSsIt9llVb8ty6wNtVZunXIggQeqr+2lbct6LQbv+iYYK+HuSIXgBLjhF0aNi MVTWV5ll/D0tFmszne/fzY9s/tLWQqV7p5b2FQJom9cw5YQ4gizhEDQhcIh2c5+OOO2c k5nJKzCdzWsSNf6BixKyPRjXtZCZP8bvT3BWztwhJwAyTXrtmKMjB98qy0VTzQTP95Z/ 2CP7R/F5rQQiiVgIaL55S0MzKZhG41IWE0GMZYFKQQFkazBnegZpnNDHdLPFnStmzo64 iJIvvmIIAKOyYP4FOAEruWTq2CwZ6Em0Hw2ntBXT8Exyvs9qycUAzl6Cjaz7nIQY9xM8 O9LA== X-Gm-Message-State: AJaThX5Fz4NztZII0iwWAXY4t8WkZNye1J2EoXrZDmfshq/qLLvBDqTs QIFiHKdcNVrn9x+TqN08tstG5g== X-Received: by 10.28.169.194 with SMTP id s185mr10736850wme.119.1511183054831; Mon, 20 Nov 2017 05:04:14 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id x185sm8131191wmx.12.2017.11.20.05.04.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 05:04:14 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Nov 2017 14:03:14 +0100 Message-Id: <20171120130314.17105-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avfilter/af_asetnsamples: add missing error check 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: Paul B Mahol --- libavfilter/af_asetnsamples.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c index 3c2f66b30a..ecb76e64db 100644 --- a/libavfilter/af_asetnsamples.c +++ b/libavfilter/af_asetnsamples.c @@ -140,11 +140,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) return -1; } } - av_audio_fifo_write(asns->fifo, (void **)insamples->extended_data, nb_samples); - if (asns->next_out_pts == AV_NOPTS_VALUE) + ret = av_audio_fifo_write(asns->fifo, (void **)insamples->extended_data, nb_samples); + if (ret > 0 && asns->next_out_pts == AV_NOPTS_VALUE) asns->next_out_pts = insamples->pts; av_frame_free(&insamples); + if (ret < 0) + return ret; + while (av_audio_fifo_size(asns->fifo) >= asns->nb_out_samples) push_samples(outlink); return 0;