[FFmpeg-cvslog] avfilter/af_afade: Remove redundant checks and assignments
Andreas Rheinhardt
git at videolan.org
Tue Sep 21 19:49:42 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Sep 21 02:40:56 2021 +0200| [9985ea765132fd0ff7c658637e033a165820e958] | committer: Andreas Rheinhardt
avfilter/af_afade: Remove redundant checks and assignments
The acrossfade filter uses the ff_set_common_* functions in its
query_formats(), so that the formats, the sample rates as well as
the channel layouts and counts of all links coincide.
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9985ea765132fd0ff7c658637e033a165820e958
---
libavfilter/af_afade.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c
index a55d5d72c3..3bd0331e77 100644
--- a/libavfilter/af_afade.c
+++ b/libavfilter/af_afade.c
@@ -588,18 +588,7 @@ static int acrossfade_config_output(AVFilterLink *outlink)
AVFilterContext *ctx = outlink->src;
AudioFadeContext *s = ctx->priv;
- if (ctx->inputs[0]->sample_rate != ctx->inputs[1]->sample_rate) {
- av_log(ctx, AV_LOG_ERROR,
- "Inputs must have the same sample rate "
- "%d for in0 vs %d for in1\n",
- ctx->inputs[0]->sample_rate, ctx->inputs[1]->sample_rate);
- return AVERROR(EINVAL);
- }
-
- outlink->sample_rate = ctx->inputs[0]->sample_rate;
outlink->time_base = ctx->inputs[0]->time_base;
- outlink->channel_layout = ctx->inputs[0]->channel_layout;
- outlink->channels = ctx->inputs[0]->channels;
switch (outlink->format) {
case AV_SAMPLE_FMT_DBL: s->crossfade_samples = crossfade_samples_dbl; break;
More information about the ffmpeg-cvslog
mailing list