aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-08-15 10:26:06 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-08-20 14:30:46 +0200
commit3969c2abfb29c230cfce2ebfdcaaf6d0f0266b30 (patch)
tree68d3622375b63d7334cecc7f6e2719af7060b219
parent4f46c3cf5c78cac303bf4c9877e8544f0e512449 (diff)
downloadffmpeg-3969c2abfb29c230cfce2ebfdcaaf6d0f0266b30.tar.gz
avfilter/avfiltergraph: Remove dead checks
These checks emit warnings in case the channel layouts lists are inconsistent; yet since 69f5f6ea375950b4845b241ee27054bfc8f00343 a function that is called earlier errors out if they are inconsistent. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavfilter/avfiltergraph.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 13c81a5f4a..383d9c5478 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -295,21 +295,6 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, const char *nam
return NULL;
}
-static void sanitize_channel_layouts(void *log, AVFilterChannelLayouts *l)
-{
- if (!l)
- return;
- if (l->nb_channel_layouts) {
- if (l->all_layouts || l->all_counts)
- av_log(log, AV_LOG_WARNING, "All layouts set on non-empty list\n");
- l->all_layouts = l->all_counts = 0;
- } else {
- if (l->all_counts && !l->all_layouts)
- av_log(log, AV_LOG_WARNING, "All counts without all layouts\n");
- l->all_layouts = 1;
- }
-}
-
static int filter_link_check_formats(void *log, AVFilterLink *link, AVFilterFormatsConfig *cfg)
{
int ret;
@@ -359,7 +344,7 @@ static int filter_check_formats(AVFilterContext *ctx)
static int filter_query_formats(AVFilterContext *ctx)
{
- int ret, i;
+ int ret;
AVFilterFormats *formats;
AVFilterChannelLayouts *chlayouts;
enum AVMediaType type = ctx->inputs && ctx->inputs [0] ? ctx->inputs [0]->type :
@@ -376,11 +361,6 @@ static int filter_query_formats(AVFilterContext *ctx)
if (ret < 0)
return ret;
- for (i = 0; i < ctx->nb_inputs; i++)
- sanitize_channel_layouts(ctx, ctx->inputs[i]->outcfg.channel_layouts);
- for (i = 0; i < ctx->nb_outputs; i++)
- sanitize_channel_layouts(ctx, ctx->outputs[i]->incfg.channel_layouts);
-
formats = ff_all_formats(type);
if ((ret = ff_set_common_formats(ctx, formats)) < 0)
return ret;