[FFmpeg-devel] [PATCH 4/4] lavfi: remove init and check of rate and layout.

Nicolas George nicolas.george at normalesup.org
Sun Dec 2 18:39:13 CET 2012


The sample rate and channel layout are negociated and set
by the filter graph system.

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 libavfilter/avfilter.c |    9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 392e32d..08e33a8 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -281,17 +281,8 @@ int avfilter_config_links(AVFilterContext *filter)
 
             case AVMEDIA_TYPE_AUDIO:
                 if (inlink) {
-                    if (!link->sample_rate)
-                        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 "
-                           "sample_rate\n");
-                    return AVERROR(EINVAL);
                 }
 
                 if (!link->time_base.num && !link->time_base.den)
-- 
1.7.10.4



More information about the ffmpeg-devel mailing list