From patchwork Sat Nov 4 07:56:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44515 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3aa6:b0:181:818d:5e7f with SMTP id d38csp336633pzh; Sat, 4 Nov 2023 02:24:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPtYupWm5VLqbrz0Km00Y1MP9AqC4O75sZHfyj36Usb59pRIPpz3UYprcJMs9fmh3IwZIi X-Received: by 2002:a50:e70f:0:b0:53e:6da7:72ba with SMTP id a15-20020a50e70f000000b0053e6da772bamr19836569edn.38.1699089841002; Sat, 04 Nov 2023 02:24:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699089840; cv=none; d=google.com; s=arc-20160816; b=mq4f12Vl5en4KdS3zP7FltsBMJGjFVIllO2kUo54Zc+Ctf4l55gOhV8pZK1Q5aVhq/ pusybWg9UL9ZcF6kNrjL1zqKaUU3+xdyC74pqNIFxXKIUmWGjWDz4saDkGpfzs5EHR2K CwHIYl1E1P4bshUiHGzfzPhkTv7bAphqKMhftrIN75DAzdoeJHPAsOtu8mcwkZnkRq1Q 6LaZQ3E/BRPLcfaRqNJgg7Iu5OMDwlkE7lfHN8DDag+JQAfMIEGVN48fYWDsFY3kFqkV HKi26M7/F8qJ7WyxnRUfMkQCeoImMpfi5uHAOIJ5xmBJx8i1TI/1WSqc+nJmoxy6RhBF s02A== 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=/4I+uZVkWGe2oQKdbZoeRlSWBVPmaLCATWSny5rwkcE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=G2Z4MFSuxdT1X3CPENj3Bjhq+HcrmrT+EuqLbOV6+8zP4RrXqXT2yhVOKaXAY6E6Gg nizglGq7pWDeKN9Ob+3dTvsttfc27/t9nv2nEZ2CUWMUdB4SjLcTPmTkUYplK0Eihr7y Tn9QdMf99DGE1OxDc4EeTeZ1eHhGbkRdqsyUZAFxzalU5al2A0Ym8+JNKBI3zvelpLYG aa88xGRsXlAc/Y5Sn4iw5H5HrfEuBjoO2fIHiWiNwfcHJBuDcIng6BbYLehkYW9WkgDR Q3kgB2bfltAK69APOgrnhwp1JbeWiHF2I5973Po8NE6Arj4VBU8j5zkZb0KatVPvIKy0 LXIA== 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 w23-20020a50fa97000000b0053eea59d1f6si1961697edr.519.2023.11.04.02.24.00; Sat, 04 Nov 2023 02:24:00 -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; 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 8C44C68CE3D; Sat, 4 Nov 2023 11:22:09 +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 4F53368CE4F for ; Sat, 4 Nov 2023 11:21:55 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 3DD5D12DE for ; Sat, 4 Nov 2023 10:21:53 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id ltcvXdL1EJ4b for ; Sat, 4 Nov 2023 10:21:53 +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 F258A1486 for ; Sat, 4 Nov 2023 10:21:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 9B79A3A1020 for ; Sat, 4 Nov 2023 10:21:40 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Nov 2023 08:56:21 +0100 Message-ID: <20231104092125.10213-13-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231104092125.10213-1-anton@khirnov.net> References: <20231104092125.10213-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/24] 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: Bp01yR1JSMRV --- 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 9d86c29ebd..e288ea4b80 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -2516,17 +2516,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; }