[FFmpeg-cvslog] fftools/ffmpeg_filter: stop setting encoder channel layout unnecessarily

Anton Khirnov git at videolan.org
Thu Apr 13 16:42:25 EEST 2023


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Mar 29 10:34:11 2023 +0200| [5297250920bc03cc39bff586788564f60fb38af3] | committer: Anton Khirnov

fftools/ffmpeg_filter: stop setting encoder channel layout unnecessarily

The channel layout is set before opening the encoder, in enc_open().
Messing with it in configure_output_audio_filter() cannot accomplish
anything meaningful.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5297250920bc03cc39bff586788564f60fb38af3
---

 fftools/ffmpeg_filter.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index f48ae83a40..584f51ac3f 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -699,7 +699,6 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter,
 {
     OutputStream *ost = ofilter->ost;
     OutputFile    *of = output_files[ost->file_index];
-    AVCodecContext *codec  = ost->enc_ctx;
     AVFilterContext *last_filter = out->filter_ctx;
     int pad_idx = out->pad_idx;
     AVBPrint args;
@@ -750,9 +749,6 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter,
     }
 #endif
 
-    if (codec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC)
-        av_channel_layout_default(&codec->ch_layout, codec->ch_layout.nb_channels);
-
     choose_sample_fmts(ofilter,     &args);
     choose_sample_rates(ofilter,    &args);
     choose_channel_layouts(ofilter, &args);



More information about the ffmpeg-cvslog mailing list