OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
56a33b2
)
avfilter/avfilter: allow idet like scale to have parameter changes
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 19 Jan 2015 04:37:42 +0000
(
05:37
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 19 Jan 2015 05:03:57 +0000
(06:03 +0100)
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfilter.c
patch
|
blob
|
history
diff --git
a/libavfilter/avfilter.c
b/libavfilter/avfilter.c
index
b37ff1f
..
76c60c1
100644
(file)
--- 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);