diff options
author | Timo Rothenpieler <timo@rothenpieler.org> | 2017-08-14 16:03:11 +0200 |
---|---|---|
committer | Timo Rothenpieler <timo@rothenpieler.org> | 2017-08-14 16:03:11 +0200 |
commit | 62b75537db15816fde8b8a33976ffc4a8277f1fc (patch) | |
tree | 41574b5008c97f91941790f51f4fd1cda9632a72 | |
parent | f4ebbda566f73952a721c367877b1527ba697e7a (diff) | |
download | ffmpeg-62b75537db15816fde8b8a33976ffc4a8277f1fc.tar.gz |
avfilter/scale_npp: fix logic used in previous patch
-rw-r--r-- | libavfilter/vf_scale_npp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c index 3fe5bbe500..eadb3b5828 100644 --- a/libavfilter/vf_scale_npp.c +++ b/libavfilter/vf_scale_npp.c @@ -319,7 +319,11 @@ static int init_processing_chain(AVFilterContext *ctx, int in_width, int in_heig last_stage = i; } - ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(s->stages[last_stage > 0 ? last_stage : 0].frames_ctx); + if (last_stage < 0) + ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(ctx->inputs[0]->hw_frames_ctx); + else + ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(s->stages[last_stage].frames_ctx); + if (!ctx->outputs[0]->hw_frames_ctx) return AVERROR(ENOMEM); |