[FFmpeg-cvslog] avfilter/avfilter: allow idet like scale to have parameter changes

Michael Niedermayer git at videolan.org
Mon Jan 19 13:56:22 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 19 05:37:42 2015 +0100| [6c702c3c631455675c48efd70668dd7718b4a7c0] | committer: Michael Niedermayer

avfilter/avfilter: allow idet like scale to have parameter changes

Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c702c3c631455675c48efd70668dd7718b4a7c0
---

 libavfilter/avfilter.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);



More information about the ffmpeg-cvslog mailing list