Merge commit '550cb6a85d0f7211289f7a789527d48cb29460ff'
authorJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 16:47:42 +0000 (13:47 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 16:47:42 +0000 (13:47 -0300)
commit975db5dcc2edd6e374eee7050f67ad529c69ddde
tree04424af36ffcc24da7afbc61fd50675f9d09019d
parent1926f13a206bfbd99abf536e7424e2b321f2e2ad
parent550cb6a85d0f7211289f7a789527d48cb29460ff
Merge commit '550cb6a85d0f7211289f7a789527d48cb29460ff'

* commit '550cb6a85d0f7211289f7a789527d48cb29460ff':
  lavf/vf_deinterlace_qsv: Enable the qsv deinterlace vpp

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