diff options
| author | Anton Khirnov <anton@khirnov.net> | 2017-02-01 10:38:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2017-02-11 11:37:45 +0100 |
| commit | 5c8a5765dc5f4e29afb85b95be393c30f45412a8 (patch) | |
| tree | 388b70cbcb7c666f00940049b2aec6544353aaf0 /libavfilter | |
| parent | 6f554521afdf7ab4edbfaa9536660a1dca946b19 (diff) | |
| download | ffmpeg-5c8a5765dc5f4e29afb85b95be393c30f45412a8.tar.gz | |
scale_npp: explicitly set the output frames context for passthrough mode
This is no longer done automatically for filters marked as
hwframe-aware.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_scale_npp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c index 0e636a997d..be1f81f8ad 100644 --- a/libavfilter/vf_scale_npp.c +++ b/libavfilter/vf_scale_npp.c @@ -336,9 +336,11 @@ static int init_processing_chain(AVFilterContext *ctx, int in_width, int in_heig last_stage = i; } - if (last_stage < 0) - return 0; - ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(s->stages[last_stage].frames_ctx); + if (last_stage >= 0) + 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) return AVERROR(ENOMEM); |