[FFmpeg-cvslog] avfilter/avfilter: Add a few more basic filters to the list which support frame size changes

Michael Niedermayer git at videolan.org
Sat Sep 5 11:52:22 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Sep  5 11:43:27 2015 +0200| [5d859e59809f38334592fc43f8ae70a23b5a9597] | committer: Michael Niedermayer

avfilter/avfilter: Add a few more basic filters to the list which support frame size changes

Fixes assertion failures

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavfilter/avfilter.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 4d833f0..843ac98 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1161,8 +1161,11 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame)
 
     /* Consistency checks */
     if (link->type == AVMEDIA_TYPE_VIDEO) {
-        if (strcmp(link->dst->filter->name, "scale") &&
-            strcmp(link->dst->filter->name, "idet")) {
+        if (strcmp(link->dst->filter->name, "buffersink") &&
+            strcmp(link->dst->filter->name, "format") &&
+            strcmp(link->dst->filter->name, "idet") &&
+            strcmp(link->dst->filter->name, "null") &&
+            strcmp(link->dst->filter->name, "scale")) {
             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