virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-19 05:37:42 +01:00
parent 56a33b232c
commit 6c702c3c63
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/avfilter.c
View File

@ -1163,7 +1163,8 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame)
/* Consistency checks */ /* Consistency checks */
if (link->type == AVMEDIA_TYPE_VIDEO) { 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->format == link->format);
av_assert1(frame->width == link->w); av_assert1(frame->width == link->w);
av_assert1(frame->height == link->h); av_assert1(frame->height == link->h);