From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BEF9648CB0 for ; Wed, 24 Jan 2024 08:21:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C911C68D1DF; Wed, 24 Jan 2024 10:17:53 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0CFD68D0EC for ; Wed, 24 Jan 2024 10:17:27 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=rW7RsHEb; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 22DB01C0F for ; Wed, 24 Jan 2024 09:17:26 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id ZD9cgLVxE6SE for ; Wed, 24 Jan 2024 09:17:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1706084240; bh=eUrwisc90Pcynn4+5PyA+VqHRXQxNr5dBj8OaULk/B4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=rW7RsHEbgoRHdOY3wABg1gcK/fkU8CmonbJu+/211J32CFu81081wS9rYOAqIV2pN AzOggn+uIrPMVOEJJHXF04aj+TQio3yN4lZuAZRnXLfyF1q12Y+qJUgJ6pVxBNi6nt K9+f9fIXAZSYz6nLLN9qZez+x24UhQgpW+ORu7VagrgNa+Em31oJnYb0rorf0BLN69 8LsSWGBtCvEobaR3I/d4Wf7aJUTJ631Hce0IxPVBsyVPRR+xV3CC6zLgemzq022HrJ VP5OPAJaxfcBtFu+nlPb3Cev3rPO7QMq9EAjNYlTGtLqgMlBjjFCluQHp9jLVGgb+V 597Ik+fZ/UAIg== 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 949FA1A2D for ; Wed, 24 Jan 2024 09:17:20 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 882673A0582 for ; Wed, 24 Jan 2024 09:17:20 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 09:17:01 +0100 Message-ID: <20240124081702.4759-31-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240124081702.4759-1-anton@khirnov.net> References: <20240124081702.4759-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 31/31] fftools/ffmpeg: cosmetics, vertically align Input{File, Stream} 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- fftools/ffmpeg.h | 54 +++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 8395fd260c..33750e0bb3 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -328,35 +328,36 @@ typedef struct Decoder { } Decoder; typedef struct InputStream { - const AVClass *class; + const AVClass *class; /* parent source */ - struct InputFile *file; + struct InputFile *file; - int index; + int index; - AVStream *st; - int user_set_discard; + AVStream *st; + int user_set_discard; /** * Codec parameters - to be used by the decoding/streamcopy code. * st->codecpar should not be accessed, because it may be modified * concurrently by the demuxing thread. */ - AVCodecParameters *par; - Decoder *decoder; - const AVCodec *dec; + AVCodecParameters *par; + Decoder *decoder; + const AVCodec *dec; - AVRational framerate_guessed; + AVRational framerate_guessed; - AVRational framerate; /* framerate forced with -r */ + /* framerate forced with -r */ + AVRational framerate; #if FFMPEG_OPT_TOP - int top_field_first; + int top_field_first; #endif - int autorotate; + int autorotate; - int fix_sub_duration; + int fix_sub_duration; struct sub2video { int w, h; @@ -364,8 +365,8 @@ typedef struct InputStream { /* decoded data from this stream goes into all those filters * currently video and audio only */ - InputFilter **filters; - int nb_filters; + InputFilter **filters; + int nb_filters; /* * Output targets that do not go through lavfi, i.e. subtitles or @@ -379,28 +380,29 @@ typedef struct InputStream { } InputStream; typedef struct InputFile { - const AVClass *class; + const AVClass *class; - int index; + int index; AVFormatContext *ctx; - int64_t input_ts_offset; - int input_sync_ref; + int64_t input_ts_offset; + int input_sync_ref; /** * Effective format start time based on enabled streams. */ - int64_t start_time_effective; - int64_t ts_offset; - int64_t start_time; /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */ - int64_t recording_time; + int64_t start_time_effective; + int64_t ts_offset; + /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */ + int64_t start_time; + int64_t recording_time; /* streams that ffmpeg is aware of; * there may be extra streams in ctx that are not mapped to an InputStream * if new streams appear dynamically during demuxing */ - InputStream **streams; - int nb_streams; + InputStream **streams; + int nb_streams; - int accurate_seek; + int accurate_seek; } InputFile; enum forced_keyframes_const { -- 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".