diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-01 03:16:32 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-01 21:03:57 +0200 |
commit | 00f6cbb53df64a3a730d9c841dddb534ba562d53 (patch) | |
tree | 0b02106e5e05f40106e34e1658847bde675d41c2 | |
parent | f144a70d6011a71fe6a48ce1b67791301be9b788 (diff) | |
download | ffmpeg-00f6cbb53df64a3a730d9c841dddb534ba562d53.tar.gz |
vf_scale.c: propagate error code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8447703c16b9e6fdc48ce92553ec1cfa2e359b84)
-rw-r--r-- | libavfilter/vf_scale.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index ba8f9e1e82..8f2f1d5f52 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -229,7 +229,7 @@ static int config_props(AVFilterLink *outlink) scale->isws[1] = sws_getContext(inlink ->w, inlink ->h/2, inlink ->format, outlink->w, outlink->h/2, outlink->format, scale->flags, NULL, NULL, NULL); - if (!scale->sws) + if (!scale->sws || !scale->isws[0] || !scale->isws[1]) return AVERROR(EINVAL); if (inlink->sample_aspect_ratio.num){ |