[FFmpeg-cvslog] lavfi: when configuring a link, set channel layout from previous link if unspecified

Stefano Sabatini git at videolan.org
Sun Sep 2 10:49:11 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Fri Aug 31 23:55:11 2012 +0200| [34bf06a35c169d0ebb681802cf7168bf4d4eecdf] | committer: Stefano Sabatini

lavfi: when configuring a link, set channel layout from previous link if unspecified

In avfilter_config_links(), if the current channel layout is not
specified, set the same value of the previous link in the filterchain.

Consistent with the logic used to set the other link parameters.

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

 libavfilter/avfilter.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index d05d4ea..3bac29d 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -277,6 +277,8 @@ int avfilter_config_links(AVFilterContext *filter)
                         link->sample_rate = inlink->sample_rate;
                     if (!link->time_base.num && !link->time_base.den)
                         link->time_base = inlink->time_base;
+                    if (!link->channel_layout)
+                        link->channel_layout = inlink->channel_layout;
                 } else if (!link->sample_rate) {
                     av_log(link->src, AV_LOG_ERROR,
                            "Audio source filters must set their output link's "



More information about the ffmpeg-cvslog mailing list