eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8'

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

See 62b75537db

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-09-27 20:59:14 -03:00
parent 4ad0264ab3 5c8a5765dc
commit 5256a86da0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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) 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);