summaryrefslogtreecommitdiff
path: root/libavfilter/vf_scale_npp.c
diff options
context:
space:
mode:
authorTimo Rothenpieler <timo@rothenpieler.org>2017-08-14 14:15:25 +0200
committerTimo Rothenpieler <timo@rothenpieler.org>2017-08-14 14:15:27 +0200
commitf4ebbda566f73952a721c367877b1527ba697e7a (patch)
tree5ceb3b44f11b6ae514ec2620b4dabc55830a03f3 /libavfilter/vf_scale_npp.c
parent77c5a54192b2bd662bdd6bfe5976707da6b68a35 (diff)
avfilter/scale_npp: check for buffer allocation failure
I totally did not forget to amend this to the previous patch...
Diffstat (limited to 'libavfilter/vf_scale_npp.c')
-rw-r--r--libavfilter/vf_scale_npp.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c
index f64ab956c7..3fe5bbe500 100644
--- a/libavfilter/vf_scale_npp.c
+++ b/libavfilter/vf_scale_npp.c
@@ -319,13 +319,7 @@ static int init_processing_chain(AVFilterContext *ctx, int in_width, int in_heig
last_stage = i;
}
- if (last_stage < 0)
- {
- ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(ctx->inputs[0]->hw_frames_ctx);
- return 0;
- }
-
- ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(s->stages[last_stage].frames_ctx);
+ ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(s->stages[last_stage > 0 ? last_stage : 0].frames_ctx);
if (!ctx->outputs[0]->hw_frames_ctx)
return AVERROR(ENOMEM);