[FFmpeg-devel] [PATCH 39/42] fftools/ffmpeg_mux_init: cosmetics

Anton Khirnov anton at khirnov.net
Tue Aug 27 18:05:19 EEST 2024


Restore vertical alignment to OutputFilterOptions initializer.

The flags field is kept as-is, since the corresponding lines are already
long, aligning them would make them even longer, and breaking them would
look worse.
---
 fftools/ffmpeg_mux_init.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index c874ccb113..c054765be7 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -1388,23 +1388,24 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
         (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) {
         char name[16];
         OutputFilterOptions opts = {
-            .enc = enc,
-            .name        = name,
-            .format      = (type == AVMEDIA_TYPE_VIDEO) ?
-                           ost->enc_ctx->pix_fmt : ost->enc_ctx->sample_fmt,
-            .width       = ost->enc_ctx->width,
-            .height      = ost->enc_ctx->height,
-            .vsync_method = vsync_method,
-            .sample_rate = ost->enc_ctx->sample_rate,
-            .ch_layout   = ost->enc_ctx->ch_layout,
-            .sws_opts    = o->g->sws_dict,
-            .swr_opts    = o->g->swr_opts,
-            .vs          = vs,
-            .output_tb = enc_tb,
+            .enc              = enc,
+            .name             = name,
+            .format           = (type == AVMEDIA_TYPE_VIDEO) ?
+                                ost->enc_ctx->pix_fmt : ost->enc_ctx->sample_fmt,
+            .width            = ost->enc_ctx->width,
+            .height           = ost->enc_ctx->height,
+            .vsync_method     = vsync_method,
+            .sample_rate      = ost->enc_ctx->sample_rate,
+            .ch_layout        = ost->enc_ctx->ch_layout,
+            .sws_opts         = o->g->sws_dict,
+            .swr_opts         = o->g->swr_opts,
+            .vs               = vs,
+            .output_tb        = enc_tb,
             .trim_start_us    = mux->of.start_time,
             .trim_duration_us = mux->of.recording_time,
-            .ts_offset = mux->of.start_time == AV_NOPTS_VALUE ?
-                         0 : mux->of.start_time,
+            .ts_offset        = mux->of.start_time == AV_NOPTS_VALUE ?
+                                0 : mux->of.start_time,
+
             .flags = OFILTER_FLAG_DISABLE_CONVERT * !!keep_pix_fmt |
                      OFILTER_FLAG_AUTOSCALE       * !!autoscale    |
                      OFILTER_FLAG_AUDIO_24BIT * !!(av_get_exact_bits_per_sample(ost->enc_ctx->codec_id) == 24),
-- 
2.43.0



More information about the ffmpeg-devel mailing list