From patchwork Wed Dec 6 10:27:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44961 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9153:b0:181:818d:5e7f with SMTP id x19csp161310pzc; Wed, 6 Dec 2023 02:31:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IHEpq20JU1QvE6lvsACQBJtTd0KXUijfBbjp5UylS8sJQFFhKq5ScxfzLbw1sJQktqsbL4/ X-Received: by 2002:a50:c119:0:b0:54d:473:c8de with SMTP id l25-20020a50c119000000b0054d0473c8demr787192edf.33.1701858679027; Wed, 06 Dec 2023 02:31:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701858679; cv=none; d=google.com; s=arc-20160816; b=k64C7w3UP8OHLdrhS0Q8JOzCIP0FfKtTzqlRylF3lZ/2WpZ944dPMyOzO4oskeoScs 7NQ5kSRIjW0o+bY8WwBWs+RbKMo9ODeYqzcDQt3R+P6pGT2XRknRrvOcJ09f//dKFR3/ lS84k45h0gbf6ZQ48d02EB4E06+5uEw6ce1GV5TYVnWuo61fLRwtUIuX58f8fa5Buucz 180Gq6UgSSgxdWJOj2mH3N5Jxoc69406pxmEUt5xg4o4IG/2WU/rbYYsicgDfX4x/Zki WO4pBbOnqR0fCNCEX1QpdJKi1DDB77B3sRzOhPHYDiXYu3GuiVqKLjwXh7VJmfdtr6gd w22Q== 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=B+B7ZHTQXMd6zaqBEsZSTNgSajgwPa6fYnGlQR+YzyY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=sUKW4Apg3H3pc3lAvaxd9/7JXdjKBsF4E8wqy/mz8rYoLKndgHZIfkFNo6gNn4Vmg/ cqwCTorTi55/xueSyQ2+M3+DUhQD0Y8OnQKU++MRj+TOTilFbSz5rFfFGJ3NS5pqqV6x AfJy4KhhRlOKPOHyiACekJNBWy+N+ZN+3G2JVCt1/6WB6ZdObJyq5TQ8/TUNyEo9nulf 6mt40McGZ6L8t3drWsWy7+8lrqyzEz5pGWdsklivEJz2CY+ER9PiJwkmC7iQIPNh9EtF wfb79EUce5dEhUlyvGh1UP4C7wWVR3nSdhrkwi8l0tXrBRXWotrOqYAb1a6OmvgmZd0a tq8g== 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 o24-20020aa7c518000000b0054c2a05e8e8si1972292edq.630.2023.12.06.02.31.18; Wed, 06 Dec 2023 02:31:19 -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 0ACA868CF73; Wed, 6 Dec 2023 12:30:24 +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 4DE1568CF5C for ; Wed, 6 Dec 2023 12:30:17 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 1A13B1CBF for ; Wed, 6 Dec 2023 11:30:12 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id iSCdjKymEMYU for ; Wed, 6 Dec 2023 11:30:11 +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 845801D38 for ; Wed, 6 Dec 2023 11:30:10 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6EB8F3A067E for ; Wed, 6 Dec 2023 11:30:10 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Dec 2023 11:27:10 +0100 Message-ID: <20231206103002.30084-5-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231206103002.30084-1-anton@khirnov.net> References: <20231206103002.30084-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] 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: QqYLrf9Ldmn6 --- 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 1800296aa4..1df1212442 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; }