diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-12-02 16:34:17 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-12-20 13:03:42 +0100 |
| commit | 0146c1f0f173417b2b90f35a2fdf87604cf9227a (patch) | |
| tree | 151683313b32e596534b2196a62921072c822af0 | |
| parent | 5033a1af1711b6d99b689672f638222c8494bd56 (diff) | |
| download | ffmpeg-0146c1f0f173417b2b90f35a2fdf87604cf9227a.tar.gz | |
lavfi: remove init and check of rate and layout.
The sample rate and channel layout are negotiated and set
by the filter graph system.
| -rw-r--r-- | libavfilter/avfilter.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 392e32df1c..08e33a8c27 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) |