virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavfi: limit matching w/h/fmt asserts to non scale filters

Browse Source 
This fixes a regression with the scale filters input changing.
In the long run filters should get a flag to indicate support of this
and then this flag be used here.
But the regression should not be left standing until thats done.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-16 23:58:26 +02:00
parent 6cbb8a450f
commit 5d2b885074
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/video.c
View File

@@ -249,9 +249,11 @@ int ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
FF_TPRINTF_START(NULL, start_frame); ff_tlog_link(NULL, link, 0); ff_tlog(NULL, " "); ff_tlog_ref(NULL, picref, 1); FF_TPRINTF_START(NULL, start_frame); ff_tlog_link(NULL, link, 0); ff_tlog(NULL, " "); ff_tlog_ref(NULL, picref, 1);
if (strcmp(link->dst->filter->name, "scale")) {
av_assert1(picref->format == link->format); av_assert1(picref->format == link->format);
av_assert1(picref->video->w == link->w); av_assert1(picref->video->w == link->w);
av_assert1(picref->video->h == link->h); av_assert1(picref->video->h == link->h);
}
if (link->closed) { if (link->closed) {
avfilter_unref_buffer(picref); avfilter_unref_buffer(picref);