From patchwork Thu Nov 23 19:15:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44771 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp802262pzb; Thu, 23 Nov 2023 11:19:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQKCRXUAyty+Kep0OQUd0gNiimOgBOkTQrr6dE+vrd1a3pkbWdR7OuBWnYyGgdZ3a1jt1v X-Received: by 2002:ac2:5498:0:b0:505:7123:21ae with SMTP id t24-20020ac25498000000b00505712321aemr94955lfk.6.1700767198313; Thu, 23 Nov 2023 11:19:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700767198; cv=none; d=google.com; s=arc-20160816; b=ZlgPiOgbg6LUEuz3Z4v2dCDVpP/GqgtvcZHlFGbxGSplNFtUdOZs7v2xj9+7NrZCUp kdG0aUIufzqzkeamEEXztcgSdnkbvoz3RQ24z20bIq/oSkA8UpItbITFlefW5hNn7A2j VSpX5tTfrXQF1Wa1uFVxf/W/YDsdkF89cIPLjk5OQbBqaFr2G71YCCzCDmw/aNSk/Tmx OT4KbC8S4IxaHJ8PGDFdSf3x/KZa7fyBbzf+LhchVvw1dWQ69MnkXN5QD8MUb9qRLCFn FiaXNVuFed8RKD86lJO+mv3O5jbSQVEy5Ab6/f0UnWllmn4CMUfDCOa0SWTf4IcN2eNz oF5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=7wiXZJkCSZOw7V0BUT+f9q3R0F4Y40dDwu8OkBFa1aQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=rEKpuYAGX2mCLxPxYtmFgE/qkWk7zzdHxrKE/kXnGQaAv3lN4OHQ7mFq1EsdUIkgHi GN67ss6uz8G+EVADMblJu0Mz79LnMFc2DEHlGF8lNVdL+OgmXZAuHWlWlnWKLVjOEEVk tWMok+SHRdbCU9Tq9nPsFANop9m8nXXYCDvT9tJYN1qc/0Dd3h9joue1ZlTbkG6N+FJV +T8ia4jeeZ8UOpab6n8XKvuNiGA9yyvtH4xqCQHWO30qTywRDi6afhrEH1+nu0o5iRW0 XLFsD3McRe7G90WVhJRwloPXdnkInEX+83wbt6IUndpi5NASj0A0MFy+6c0QtojcuLTb lP3Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jo9-20020a170906f6c900b009dd8bc877a3si959752ejb.422.2023.11.23.11.19.57; Thu, 23 Nov 2023 11:19:58 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3822368CF04; Thu, 23 Nov 2023 21:19:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEDA768CEF7 for ; Thu, 23 Nov 2023 21:18:53 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 82FE113B0 for ; Thu, 23 Nov 2023 20:18:18 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id WCQHHEecsM3a for ; Thu, 23 Nov 2023 20:18:18 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 55D4D151A for ; Thu, 23 Nov 2023 20:18:15 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 49EC53A0688 for ; Thu, 23 Nov 2023 20:18:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Nov 2023 20:15:02 +0100 Message-ID: <20231123191524.11296-9-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231123191524.11296-2-anton@khirnov.net> References: <20231123191524.11296-2-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/13] fftools/ffmpeg_filter: reindent X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: XlfXSIoNLarO --- fftools/ffmpeg_filter.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 3bafef9717..cd4b55dd40 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -2526,17 +2526,17 @@ static int sub2video_frame(InputFilter *ifilter, AVFrame *frame) return 0; } - if (!frame) { - if (ifp->sub2video.end_pts < INT64_MAX) - sub2video_update(ifp, INT64_MAX, NULL); + if (!frame) { + if (ifp->sub2video.end_pts < INT64_MAX) + sub2video_update(ifp, INT64_MAX, NULL); - return av_buffersrc_add_frame(ifp->filter, NULL); - } + return av_buffersrc_add_frame(ifp->filter, NULL); + } - ifp->width = frame->width ? frame->width : ifp->width; - ifp->height = frame->height ? frame->height : ifp->height; + ifp->width = frame->width ? frame->width : ifp->width; + ifp->height = frame->height ? frame->height : ifp->height; - sub2video_update(ifp, INT64_MIN, (const AVSubtitle*)frame->buf[0]->data); + sub2video_update(ifp, INT64_MIN, (const AVSubtitle*)frame->buf[0]->data); return 0; }