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)
commit5256a86da067a324ece20bb9584880f5a63744ce
tree948e1eb250186e38ea71afaaaf41cfbf7d1459d1
parent4ad0264ab3d4ecfc0b5a3a399224ead33f1a5754
parent5c8a5765dc5f4e29afb85b95be393c30f45412a8
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>
libavfilter/vf_scale_npp.c