From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id 88F81482E8
for <ffmpegdev@gitmailbox.com>; Thu, 23 Nov 2023 19:19:55 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFA1068CF2B;
Thu, 23 Nov 2023 21:19:00 +0200 (EET)
Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEDA768CEF7
for <ffmpeg-devel@ffmpeg.org>; 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 <ffmpeg-devel@ffmpeg.org>; 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 <ffmpeg-devel@ffmpeg.org>;
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 <ffmpeg-devel@ffmpeg.org>; 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 <ffmpeg-devel@ffmpeg.org>; Thu, 23 Nov 2023 20:18:15 +0100 (CET)
From: Anton Khirnov <anton@khirnov.net>
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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20231123191524.11296-9-anton@khirnov.net/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
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;
}
--
2.42.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".