History

scale_npp: explicitly set the output frames context for passthrough mode

This is no longer done automatically for filters marked as hwframe-aware.

Anton Khirnov committed 9 years ago

Commit 5c8a5761 parent 6f554521 file · +5 −3Browse files

Unified · Split

libavfilter/vf_scale_npp.c+5−3
@@ -336,9 +336,11 @@ static int init_processing_chain(AVFilterContext *ctx, int in_width, int in_heig · 335 unmodified lines
336336 last_stage = i;
337337 }
338338
339− if (last_stage < 0)
340− return 0;
341− ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(s->stages[last_stage].frames_ctx);
339+ if (last_stage >= 0)
340+ ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(s->stages[last_stage].frames_ctx);
341+ else
342+ ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(ctx->inputs[0]->hw_frames_ctx);
343+
342344 if (!ctx->outputs[0]->hw_frames_ctx)
343345 return AVERROR(ENOMEM);
344346

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t