ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Wed Sep 27 20:59:14 2017 -0300| [5256a86da067a324ece20bb9584880f5a63744ce] | committer: James Almer
Merge commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8' * commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8': scale_npp: explicitly set the output frames context for passthrough mode See 62b75537db15816fde8b8a33976ffc4a8277f1fc Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5256a86da067a324ece20bb9584880f5a63744ce --- libavfilter/vf_scale_npp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c index eadb3b5828..8a277ce8e1 100644 --- a/libavfilter/vf_scale_npp.c +++ b/libavfilter/vf_scale_npp.c @@ -319,10 +319,10 @@ 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); - else + if (last_stage >= 0) ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(s->stages[last_stage].frames_ctx); + else + ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(ctx->inputs[0]->hw_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
