Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 15/25] fftools/ffmpeg: reindent after previous commit
Date: Wed, 19 Apr 2023 21:52:33 +0200
Message-ID: <20230419195243.2974-15-anton@khirnov.net> (raw)
In-Reply-To: <20230419195243.2974-1-anton@khirnov.net>

---
 fftools/ffmpeg_mux_init.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 28254cb49b..ad5a451581 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -128,21 +128,20 @@ static int choose_encoder(const OptionsContext *o, AVFormatContext *s,
         return 0;
     }
 
-        if (!codec_name) {
-            ost->par_in->codec_id = av_guess_codec(s->oformat, NULL, s->url,
-                                                         NULL, ost->type);
-            *enc = avcodec_find_encoder(ost->par_in->codec_id);
-            if (!*enc) {
-                av_log(ost, AV_LOG_FATAL, "Automatic encoder selection failed "
-                       "Default encoder for format %s (codec %s) is "
-                       "probably disabled. Please choose an encoder manually.\n",
-                        s->oformat->name, avcodec_get_name(ost->par_in->codec_id));
-                return AVERROR_ENCODER_NOT_FOUND;
-            }
-        } else if (strcmp(codec_name, "copy")) {
-            *enc = find_codec_or_die(ost, codec_name, ost->type, 1);
-            ost->par_in->codec_id = (*enc)->id;
-        }
+    if (!codec_name) {
+        ost->par_in->codec_id = av_guess_codec(s->oformat, NULL, s->url, NULL, ost->type);
+        *enc = avcodec_find_encoder(ost->par_in->codec_id);
+        if (!*enc) {
+            av_log(ost, AV_LOG_FATAL, "Automatic encoder selection failed "
+                   "Default encoder for format %s (codec %s) is "
+                   "probably disabled. Please choose an encoder manually.\n",
+                    s->oformat->name, avcodec_get_name(ost->par_in->codec_id));
+            return AVERROR_ENCODER_NOT_FOUND;
+        }
+    } else if (strcmp(codec_name, "copy")) {
+        *enc = find_codec_or_die(ost, codec_name, ost->type, 1);
+        ost->par_in->codec_id = (*enc)->id;
+    }
 
     return 0;
 }
-- 
2.39.1

_______________________________________________
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".

  parent reply	other threads:[~2023-04-19 19:55 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-19 19:52 [FFmpeg-devel] [PATCH 01/25] fftools/ffmpeg_filter: drop write-only FilterGraph.reconfiguration Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 02/25] fftools/ffmpeg_filter: drop unused AUTO_INSERT_FILTER_INPUT() Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 03/25] lavfi/avf_concat: rescale frame durations Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 04/25] fftools/ffmpeg_enc: always use video frame durations when available Anton Khirnov
2023-04-19 20:42   ` James Almer
2023-04-19 21:12     ` Anton Khirnov
2023-04-24 10:22   ` Nicolas George
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 05/25] fftools/ffmpeg_enc: rename next_picture to frame Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 06/25] fftools/ffmpeg_enc: move handling final frames to video_sync_process() Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 07/25] fftools/ffmpeg: stop using InputStream.pts in ts_discontinuity_detect() Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 08/25] fftools/ffmpeg: stop setting InputStream.pts for streamcopy Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 09/25] fftools/ffmpeg: replace stream timebase with packet one where appropriate Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 10/25] fftools/ffmpeg_mux_init: consolidate handling -filter for audio/video Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 11/25] fftools/ffmpeg_mux_init: move check for mixing simple/complex filters Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 12/25] fftools/ffmpeg_mux_init: drop OutputStream.filters[_script] Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 13/25] fftools/ffmpeg: remove unused function arguments Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 14/25] fftools/ffmpeg_mux_init: drop useless new_stream_{data, unknown} Anton Khirnov
2023-04-19 19:52 ` Anton Khirnov [this message]
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 16/25] fftools/ffmpeg_filter: add a function for creating a filtergraph Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 17/25] fftools/ffmpeg_mux_init: drop a redundant assignment Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 18/25] fftools/ffmpeg: simplify init_output_filter() Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 19/25] fftools/ffmpeg_mux_init: rename init_output_filter() to ost_add_from_filter() Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 20/25] fftools/ffmpeg: move filtering functions to ffmpeg_filter Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 21/25] fftools/ffmpeg: move freeing a filtergraph into a separate function Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 22/25] fftools/ffmpeg_filter: reindent after previous commit Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 23/25] fftools/ffmpeg_filter: add filtergraph private data Anton Khirnov
2023-04-24 10:20   ` Nicolas George
2023-04-24 11:17     ` Anton Khirnov
2023-04-24 11:19       ` Nicolas George
2023-04-24 11:57         ` Anton Khirnov
2023-04-24 11:59           ` Nicolas George
2023-04-24 12:07             ` Anton Khirnov
2023-04-24 12:13               ` Nicolas George
2023-04-24 12:30                 ` Anton Khirnov
2023-04-24 18:31                   ` Nicolas George
2023-04-24 18:33                     ` Paul B Mahol
2023-04-24 18:37                       ` James Almer
2023-04-24 18:41                         ` Paul B Mahol
2023-04-24 19:17                     ` Anton Khirnov
2023-04-24 19:24                       ` Nicolas George
2023-04-24 19:41                         ` Anton Khirnov
2023-04-24 20:33                           ` Nicolas George
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 24/25] fftools/ffmpeg: deprecate -adrift_threshold Anton Khirnov
2023-04-19 19:52 ` [FFmpeg-devel] [PATCH 25/25] fftools/ffmpeg_filter: make ifilter_parameters_from_frame() static Anton Khirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230419195243.2974-15-anton@khirnov.net \
    --to=anton@khirnov.net \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git