Merge commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8'
authorJames Almer <jamrial@gmail.com>
Wed, 27 Sep 2017 23:59:14 +0000 (20:59 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 27 Sep 2017 23:59:14 +0000 (20:59 -0300)
* commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8':
  scale_npp: explicitly set the output frames context for passthrough mode

See 62b75537db15816fde8b8a33976ffc4a8277f1fc

Merged-by: James Almer <jamrial@gmail.com>
libavfilter/vf_scale_npp.c

index eadb3b5..8a277ce 100644 (file)
@@ -319,10 +319,10 @@ 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);
-    else
+    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);