Merge commit '29a8ed766354c45c9be4b8512c5b2eb25a450cdc'
authorJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 22:58:47 +0000 (19:58 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 22:58:47 +0000 (19:58 -0300)
* commit '29a8ed766354c45c9be4b8512c5b2eb25a450cdc':
  lavf/qsvvpp: bypass vpp if not needed.

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

Simple merge