summaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_scale.c
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-07-18 11:03:56 +0200
committerNicolas George <nicolas.george@normalesup.org>2013-07-18 12:08:25 +0200
commitebaf20e94b99edfa2d1fb70e68ae6eba90773a47 (patch)
treeea16d1f91222c216121d0a93979431ad692375e3 /libavfilter/vf_scale.c
parent630fc7dcfc31ad630405dbe44ade53ec83be0ae3 (diff)
downloadffmpeg-streaming-ebaf20e94b99edfa2d1fb70e68ae6eba90773a47.zip
ffmpeg-streaming-ebaf20e94b99edfa2d1fb70e68ae6eba90773a47.tar.gz
lavfi/scale: allocate interlaced scalers only if needed.
Fix "Value 0.000000 for parameter 'srch' out of range" error message when source or destination height is 1. Note: since the av_opt_set_int() calls are not checked for failure and the interlaced scalers are not actually used, this error has no consequence apart from a frightening message in the log.
Diffstat (limited to 'libavfilter/vf_scale.c')
-rw-r--r--libavfilter/vf_scale.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index a71340a..c91bbaa 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -287,6 +287,8 @@ static int config_props(AVFilterLink *outlink)
if ((ret = sws_init_context(*s, NULL, NULL)) < 0)
return ret;
+ if (!scale->interlaced)
+ break;
}
}
OpenPOWER on IntegriCloud