[FFmpeg-cvslog] fftools/ffmpeg: reindent after previous commit
Anton Khirnov
git at videolan.org
Mon Apr 24 18:03:14 EEST 2023
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Apr 18 11:13:35 2023 +0200| [2104de13e93fc91c99d9c0e5cac4147b67a900d7] | committer: Anton Khirnov
fftools/ffmpeg: reindent after previous commit
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2104de13e93fc91c99d9c0e5cac4147b67a900d7
---
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;
}
More information about the ffmpeg-cvslog
mailing list