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)
commitae7e66fb4b1a256fb79a016b9c585de84ac77339
tree93468125fb915952166dfc881f0e5f6195fe0bf3
parent6f277e1f76121736baf98aedb2bf55d8bb413fa7
parent29a8ed766354c45c9be4b8512c5b2eb25a450cdc
Merge commit '29a8ed766354c45c9be4b8512c5b2eb25a450cdc'

* commit '29a8ed766354c45c9be4b8512c5b2eb25a450cdc':
  lavf/qsvvpp: bypass vpp if not needed.

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