ffmpeg | branch: master | Timo Rothenpieler <t...@rothenpieler.org> | Mon Aug 14 14:15:25 2017 +0200| [f4ebbda566f73952a721c367877b1527ba697e7a] | committer: Timo Rothenpieler
avfilter/scale_npp: check for buffer allocation failure I totally did not forget to amend this to the previous patch... > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4ebbda566f73952a721c367877b1527ba697e7a --- libavfilter/vf_scale_npp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c index f64ab956c7..3fe5bbe500 100644 --- a/libavfilter/vf_scale_npp.c +++ b/libavfilter/vf_scale_npp.c @@ -319,13 +319,7 @@ static int init_processing_chain(AVFilterContext *ctx, int in_width, int in_heig last_stage = i; } - if (last_stage < 0) - { - ctx->outputs[0]->hw_frames_ctx = av_buffer_ref(ctx->inputs[0]->hw_frames_ctx); - return 0; - } - - 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 > 0 ? last_stage : 0].frames_ctx); if (!ctx->outputs[0]->hw_frames_ctx) return AVERROR(ENOMEM); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
