From patchwork Mon Feb 5 01:33:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 7507 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp2237120jai; Sun, 4 Feb 2018 17:39:55 -0800 (PST) X-Google-Smtp-Source: AH8x2257tmel0cfPlb6+MXUMPzHYmOnTyAr7pgFbPwqaS4FyDAi54TDhrnxgDXdvlWC5jaVONQwB X-Received: by 10.223.182.4 with SMTP id f4mr16647208wre.11.1517794795539; Sun, 04 Feb 2018 17:39:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517794795; cv=none; d=google.com; s=arc-20160816; b=QDZ8r4LaS7fzgxLd7Q3spEGs5NxR2zVZlePtdvRwVKaqxXXyQzrx/dtSpbFaxlvwnk /8oAXbq0WDyG7Just28+/hN9kpOLYz46wE7EMGGeiHS9aiUTXKBIMn4oUrRD/ckFRGVD o042SigOxUIBjvWHuOy+IYg823lXXng0peX1hlXwREK1TQpTXDOuTxwgImFetGO4B+At hB8ycZz39Ajf4sDHEonSHFbI/MH2BTOyl+ryIWyN+v8DHA5nDqjRQK9SEcLs32NJYsUI DVO6Bgd33TiScai+RAJPy+G5HnStV6zv39JEUktkeAczhpsFhWd5wwj9lt/dWYdIbsJR 2zkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=tAfvj72o9RIPAX4Mul7CiL99CKoxZQfyGqDMYpuYX9w=; b=rFy22CCSHYgOEGcuZHK1+dTpfzKYOky3Vz0lP8aGJ+LDbhpLpnKuiS5meBjIGWmILT M0njPrrb9KHJiV6fWke/Xdyurqpv0O7uAieBq6jTwKAlS+qxvcAMhOhQArrfglTHyiiQ Gr/fjgVrv0nli/tK1pBG954DaAxAfe5it5vQTXN+HDQmDQUYm9RRmTgt/8QD/ipJ5men ZPOPdv0UX0Rqp7EuUfKmTcFKTaTqmjfmfAhcDelcjJUT0ZzJ6gvL2zvnduHwNLvBdDTM 8C1bjxmUPrwh8wH/tSWTxBXE2zAMx5djppTFfg+u2NbeZ9BVEnbcV6HMeAqFBxrozdqF XiXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=kQytQKAw; 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 d201si4837031wmd.222.2018.02.04.17.39.54; Sun, 04 Feb 2018 17:39:55 -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=kQytQKAw; 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 9BB8F689723; Mon, 5 Feb 2018 03:39:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f175.google.com (mail-io0-f175.google.com [209.85.223.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE9BD6882E5 for ; Mon, 5 Feb 2018 03:39:39 +0200 (EET) Received: by mail-io0-f175.google.com with SMTP id f4so28618610ioh.8 for ; Sun, 04 Feb 2018 17:39:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=KCevqy3eObwPSFYojeljYIZMuwB5HpcY0n7KFVCKao0=; b=kQytQKAw1/Y3tKVCAjELx5xlNZbbgxh6ySL0ujULNv5Oq1R3pj3yNqvJmtxCzjcqeS 3etFcl5mMTtDLCg/dE33Zfrs+xcU2iOZmgVceqORJGawuZihpqmb94ss3fnxGpJzlKfj 1+GBujEZtmOXPMoo0ptdcXcJFRtLEgXv6IloXd82B286T3zrPl5YjUUprs9w7D3JVhSi waPcTrn/MqWJ2u2Qdg/xpOHuZE/CJvsrNdN8FCimywMSuF8S0AEr0Msj0Fi9cIBlACAL KsBT7w6NpqOz9tb0Rs0Q2Z+JONMnql24+jn7QHkYFLwH6pU7QY4PIqlOePPP9yZYrwrK oXPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=KCevqy3eObwPSFYojeljYIZMuwB5HpcY0n7KFVCKao0=; b=GKakd6j7lxhDnQfzHXEYxJRE+uVTAAAwEN0DIY1Ar4COJlbc/Hz2G8mBrLq2Q0Xxdj pO/rLf42idZAFRjhKPHuUwfr/BsKBwSnh8h0/r97WnOJcIp+rhimPeGh0eeK5rdvqG1V Gl/cUzTBM8eqTr3Y1w+L2kTv+vvv8of25oac224diH/sRnwzjH06ccenBeYjE+cvz7wX rS50Md8VGAO9sY3YU9l9vnqkUC59GuRkDD6avUOGYZJG1FtJ0OOQcJQuBXs/BPvea4W/ hS8P2v3X5wNwRPbl4OdSUqMBWqiJDSOhqUL9b2nPpT12lO77lTjqSjJB6VXlzbRMWhru ToHA== X-Gm-Message-State: AKwxytegisMuWs1WBXXA0bisb4TPvldPwFmSAHDw/xkkNxWBCgfvPd3x dmY5ciNCItSraHWab+n4P2WhqazmNrodVqSWZO1yqg== X-Received: by 10.107.178.195 with SMTP id b186mr56439226iof.9.1517794444559; Sun, 04 Feb 2018 17:34:04 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.138.185 with HTTP; Sun, 4 Feb 2018 17:33:44 -0800 (PST) From: Carl Eugen Hoyos Date: Mon, 5 Feb 2018 02:33:44 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavfi/avfiltergraph: Do not return ENOMEM if filter is missing 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" Hi! OOM is unlikely as a failure for avfilter_graph_alloc_filter(), the patch avoids a surprising error if a filter was not found. Please comment, Carl Eugen From 6587726a5e96570bb54e49ccf0b7fd6d94b929c8 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 5 Feb 2018 01:43:08 +0100 Subject: [PATCH] lavfi/avfiltergraph: Do not return ENOMEM if filterchain init failed. A more likely reason is that the filter was not found. --- libavfilter/avfiltergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 4cc6892..7ccd895 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -147,7 +147,7 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *fil *filt_ctx = avfilter_graph_alloc_filter(graph_ctx, filt, name); if (!*filt_ctx) - return AVERROR(ENOMEM); + return -1; ret = avfilter_init_str(*filt_ctx, args); if (ret < 0) -- 1.7.10.4