From patchwork Thu Sep 10 21:49:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22275 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:5387:0:0:0:0:0 with SMTP id h129csp1564733ybb; Thu, 10 Sep 2020 14:52:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAHzB4Jz++QItY2eAG21GUUOaIohXSklC1YtN12E/VPvPol6BXWr/iNuXSA3BnwPVUraaA X-Received: by 2002:a05:600c:2207:: with SMTP id z7mr2116624wml.42.1599774764545; Thu, 10 Sep 2020 14:52:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599774764; cv=none; d=google.com; s=arc-20160816; b=hLoHTuSPz7ZurwhbwsJ8gRp/zns+mbE3iuXiIVvM1GQVPEcFZbBfU5ECiPrt1z+JZm KpjIQdmyfpGORIadqgPvNYxhshP8vis/V9Zx9UylZbGOb1U2mjyO/nFM4edoY9btaQ+J BP7pelXPhuPPogPKrtP6kW6/e7mCk4Z1VkBPyOGMNay7SQOK5JuGXLtqcCO3f/XSmdlG Xly9vGJGdGpUXJPYkftYBB1I+DkbOEqmK0+y4ovreftuc3b4SpbBq0iPnUZ4ZlPHugU/ evURC8ck55w3YkJ5zvw0yaFVCRfM7quvtBRPl0fKeZFck8NeADjY2GuLvaWEPZpnSpeY b8bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=y8eqDDfd7gqesv1jqaaUuIhGF3iQaFfjc5mqCoBsPHc=; b=HUGkMd324ocFH7ywcYD1CVxaHhQNKTgteX0OCFYUkVa8gu5PDTWu7m45IWlMHtTSYW DGEiEXi9eerMT82qisRV6lfZRZn8LVsR7DNwjRGAi5fVk3Gi/+HFCvB5MAbomcVnY4bO 26RLdiSOGN/kcFauKksmW237AtXK40ADlrmybb9UpQ0kmoBL/0J/zyY7axLsNg8emKyf +oGGLxBLMnGCUrNunC+msMACwfqQ3CO3SVCCYNuQORlM69mJp5g802nCt/nT2qwF1EfF dPy4+vRZlyQ6+PYYDFzHI3Sfwm1RO8OzsRVqukZasQrL8NzBymXQbdgHPX5e20kPbOrs Ja0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cVs+Qhs7; 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=QUARANTINE 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 f17si316348wru.4.2020.09.10.14.52.44; Thu, 10 Sep 2020 14:52:44 -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=cVs+Qhs7; 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=QUARANTINE 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 D161168BA15; Fri, 11 Sep 2020 00:52:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9F6168BA08 for ; Fri, 11 Sep 2020 00:52:05 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id e16so8960490wrm.2 for ; Thu, 10 Sep 2020 14:52:05 -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 :mime-version:content-transfer-encoding; bh=W/GjL3A75FJfl9xA/coayJg4S1N6ffj/GOTUB8NdiX8=; b=cVs+Qhs7EJJHYWFCJGXydqLr0dT0VVOsgQ+bAn4tkhAAGCgrCnh1NF2n1CovyfNcB4 duqUR7OfBQgh02PwJDG5nr1ECdaA4jagVfA9MDYY1YMavAhuxt59y6mozXVc3TG14S92 3JydcgKF/c9PQk/UhV5i5j5zeZCtTDW1Wqm+57ZVjDB1q58XXBgF5T2lCW25ZdUUNio8 PtvGg3u8Cs9MFrDOFn6Frw8Y1JIBc1We1VyV8AaBFDN5l+bnNtW+k6gDBnx0TMJfA4LB 97hED9WG1hJ5Wb3muyKfimwpDUG7Q8v0z5DMN8/UhtF7DE0xBaiq2LWzdv/aO1liocQl 1gbw== 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:mime-version:content-transfer-encoding; bh=W/GjL3A75FJfl9xA/coayJg4S1N6ffj/GOTUB8NdiX8=; b=LRFrVXm788cUqlbf/V/5NW4RG9Tny2YrG1UuwMN/jAnUxnIEhTtOCv4h6eQOeryI/W G+aLzmuahPKcaGVcGxCjdEv+ay8rv5I1O0qun3DhCpWAI5odRZnt23iBrm7TNWrJYZ4c b8mrcSQ1YcQu+gvYl3qx4E6C7WQMtjFYfqlhejJx2SBrUFyEKoybGg60rAK8NsXqsdCU 5c56TSoJ9PaEhtgPqPx6lW1Z7WgkChlRp3E4Qjj/Wse23ij+Vozf1+1lxIiHVEUOUo78 ADPFpejAcSGNTucHdX4kql547m4cI4gwz5BBIBSv1Yct12D1TGm67btuLAzRapBKAFfS 8ZKQ== X-Gm-Message-State: AOAM5328fv5ft78KqhBaDwwIROldT/SrCgJAFvvTLpa0KLq+32OrspiS e17XT1kji3yvNe7LCpLmsjT39tPhjXw= X-Received: by 2002:adf:f492:: with SMTP id l18mr11796591wro.280.1599774724817; Thu, 10 Sep 2020 14:52:04 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.51.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:52:04 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:49:00 +0200 Message-Id: <20200910214901.25401-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> References: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/9] avfilter/vf_subtitles: Return early upon avformat_open_input() 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: J24O/FRmj12O Content-Length: 1318 There is nothing to free at this point. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_subtitles.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 08b4d4efca..f9733c3935 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -322,7 +322,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx) ret = avformat_open_input(&fmt, ass->filename, NULL, NULL); if (ret < 0) { av_log(ctx, AV_LOG_ERROR, "Unable to open %s\n", ass->filename); - goto end; + return ret; } ret = avformat_find_stream_info(fmt, NULL); if (ret < 0)