History

Merge commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8'

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

James Almer committed 9 years ago

Commit 5256a862 parents 4ad0264 5c8a5761 file · +3 −3Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vf_scale_npp.c+3−3
@@ -319,10 +319,10 @@ static int init_processing_chain(AVFilterContext *ctx, int in_width, int in_heig · 318 unmodified lines
319 last_stage = i;319 last_stage = i;
320 }320 }
321 321
322 if (last_stage < 0)322 if (last_stage >= 0)
323 ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(ctx->inputs[0]->hw_frames_ctx);
324 else
325 ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(s->stages[last_stage].frames_ctx);323 ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(s->stages[last_stage].frames_ctx);
324 else
325 ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(ctx->inputs[0]->hw_frames_ctx);
326 326
327 if (!ctx->outputs[0]->hw_frames_ctx)327 if (!ctx->outputs[0]->hw_frames_ctx)
328 return AVERROR(ENOMEM);328 return AVERROR(ENOMEM);

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