[FFmpeg-cvslog] avfilter/src_movie: support unknown channel layouts

Paul B Mahol git at videolan.org
Wed Nov 2 11:49:37 EET 2022


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Oct 31 12:55:17 2022 +0100| [5661c8715ce4f752e676bda75b332efc669694ed] | committer: Paul B Mahol

avfilter/src_movie: support unknown channel layouts

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

 libavfilter/src_movie.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 711854c23c..5937613d13 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -196,11 +196,11 @@ static int guess_channel_layout(MovieStream *st, int st_index, void *log_ctx)
     av_channel_layout_default(&chl, dec_par->ch_layout.nb_channels);
 
     if (!KNOWN(&chl)) {
-        av_log(log_ctx, AV_LOG_ERROR,
+        av_log(log_ctx, AV_LOG_WARNING,
                "Channel layout is not set in stream %d, and could not "
                "be guessed from the number of channels (%d)\n",
                st_index, dec_par->ch_layout.nb_channels);
-        return AVERROR(EINVAL);
+        return av_channel_layout_copy(&dec_par->ch_layout, &chl);
     }
 
     av_channel_layout_describe(&chl, buf, sizeof(buf));



More information about the ffmpeg-cvslog mailing list