From ac84c1ce24a285f9cf16d4297bce73b1c4a6e435 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Mon, 20 Oct 2014 14:11:13 +0100
Subject: [PATCH] avfilter: check filter link validity
Remove now redundant check.
CC: libav-stable@libav.org
Bug-Id: CID 700371
---
libavfilter/avfilter.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index c9617dc2ff3..40989731cff 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -152,6 +152,11 @@ int avfilter_config_links(AVFilterContext *filter)
AVFilterLink *link = filter->inputs[i];
if (!link) continue;
+ if (!link->src || !link->dst) {
+ av_log(filter, AV_LOG_ERROR,
+ "Not all input and output are properly linked (%d).\n", i);
+ return AVERROR(EINVAL);
+ }
switch (link->init_state) {
case AVLINK_INIT:
@@ -181,7 +186,7 @@ int avfilter_config_links(AVFilterContext *filter)
}
if (link->time_base.num == 0 && link->time_base.den == 0)
- link->time_base = link->src && link->src->nb_inputs ?
+ link->time_base = link->src->nb_inputs ?
link->src->inputs[0]->time_base : AV_TIME_BASE_Q;
if (link->type == AVMEDIA_TYPE_VIDEO) {
--
GitLab