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>
1  2 
libavfilter/vf_scale_npp.c

Simple merge