Skip to content
Snippets Groups Projects
Commit 5256a86d authored by James Almer's avatar James Almer
Browse files

Merge commit '5c8a5765'


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

See 62b75537

Merged-by: default avatarJames Almer <jamrial@gmail.com>
parents 4ad0264a 5c8a5765
No related branches found
No related tags found
No related merge requests found
...@@ -319,10 +319,10 @@ static int init_processing_chain(AVFilterContext *ctx, int in_width, int in_heig ...@@ -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) 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); 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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment