[FFmpeg-devel] [PATCH 05/26] avfilter/af_amerge: Remove always-false samplerate check
Andreas Rheinhardt
andreas.rheinhardt at outlook.com
Tue Sep 21 09:27:25 EEST 2021
This filter uses ff_set_common_all_samplerates().
Also don't overwrite outlink->sample_rate in config_output;
it is harmless, because it is overwritten with the value it already
had, but it is an API violation.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
libavfilter/af_amerge.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index d67e3d7e32..9c6da15a9f 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -151,17 +151,7 @@ static int config_output(AVFilterLink *outlink)
AVBPrint bp;
int i;
- for (i = 1; i < s->nb_inputs; i++) {
- if (ctx->inputs[i]->sample_rate != ctx->inputs[0]->sample_rate) {
- av_log(ctx, AV_LOG_ERROR,
- "Inputs must have the same sample rate "
- "%d for in%d vs %d\n",
- ctx->inputs[i]->sample_rate, i, ctx->inputs[0]->sample_rate);
- return AVERROR(EINVAL);
- }
- }
s->bps = av_get_bytes_per_sample(ctx->outputs[0]->format);
- outlink->sample_rate = ctx->inputs[0]->sample_rate;
outlink->time_base = ctx->inputs[0]->time_base;
av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC);
--
2.30.2
More information about the ffmpeg-devel
mailing list