ffmpeg | branch: master | Timo Rothenpieler <t...@rothenpieler.org> | Mon Aug 14 16:03:11 2017 +0200| [62b75537db15816fde8b8a33976ffc4a8277f1fc] | committer: Timo Rothenpieler
avfilter/scale_npp: fix logic used in previous patch > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62b75537db15816fde8b8a33976ffc4a8277f1fc --- libavfilter/vf_scale_npp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
