From: James Almer <jamrial@gmail.com>
Date: Wed, 27 Sep 2017 23:59:14 +0000 (-0300)
Subject: Merge commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8'
X-Git-Tag: n3.5-dev~187
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/5256a86da067a324ece20bb9584880f5a63744ce

Merge commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8'

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

See 62b75537db15816fde8b8a33976ffc4a8277f1fc

Merged-by: James Almer <jamrial@gmail.com>
---

5256a86da067a324ece20bb9584880f5a63744ce