Merge commit 'ade370a4d7eab1866b6023c91c135d27c77ca465'
authorClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 08:28:03 +0000 (10:28 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 08:28:03 +0000 (10:28 +0200)
* commit 'ade370a4d7eab1866b6023c91c135d27c77ca465':
  lavfi: Add VAAPI deinterlacer

This commit is a noop, see 359586f14f46bf3f9c1ae3375d80e8c0fc377bef

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge