[FFmpeg-cvslog] vf_scale.c: propagate error code
Michael Niedermayer
git at videolan.org
Sat Oct 1 21:39:00 CEST 2011
ffmpeg | branch: release/0.8 | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 1 03:16:32 2011 +0200| [00f6cbb53df64a3a730d9c841dddb534ba562d53] | committer: Michael Niedermayer
vf_scale.c: propagate error code
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8447703c16b9e6fdc48ce92553ec1cfa2e359b84)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00f6cbb53df64a3a730d9c841dddb534ba562d53
---
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 ba8f9e1..8f2f1d5 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){
More information about the ffmpeg-cvslog
mailing list