Browse Source

Merge commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8'

* commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8':
  scale_npp: explicitly set the output frames context for passthrough mode

See 62b75537db

Merged-by: James Almer <jamrial@gmail.com>
tags/n3.4
James Almer 8 years ago
parent
commit
5256a86da0
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavfilter/vf_scale_npp.c

+ 3
- 3
libavfilter/vf_scale_npp.c View File

@@ -319,10 +319,10 @@ static int init_processing_chain(AVFilterContext *ctx, int in_width, int in_heig
last_stage = i; 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); 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) if (!ctx->outputs[0]->hw_frames_ctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);


Loading…
Cancel
Save