summaryrefslogtreecommitdiffstats
path: root/libavfilter/avfilter.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-19 05:37:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-19 06:03:57 +0100
commit6c702c3c631455675c48efd70668dd7718b4a7c0 (patch)
treee58f68716e23731b4f0d23327593a113cff3f3af /libavfilter/avfilter.c
parent56a33b232cbb71045fa6609fda3145ea08047b7d (diff)
downloadffmpeg-streaming-6c702c3c631455675c48efd70668dd7718b4a7c0.zip
ffmpeg-streaming-6c702c3c631455675c48efd70668dd7718b4a7c0.tar.gz
avfilter/avfilter: allow idet like scale to have parameter changes
Fixes assertion failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
-rw-r--r--libavfilter/avfilter.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index b37ff1f..76c60c1 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1163,7 +1163,8 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame)
/* Consistency checks */
if (link->type == AVMEDIA_TYPE_VIDEO) {
- if (strcmp(link->dst->filter->name, "scale")) {
+ if (strcmp(link->dst->filter->name, "scale") &&
+ strcmp(link->dst->filter->name, "idet")) {
av_assert1(frame->format == link->format);
av_assert1(frame->width == link->w);
av_assert1(frame->height == link->h);
OpenPOWER on IntegriCloud