Merge commit 'ca6ae3b77a7e6600e517723b90e57527a47809de'
authorClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:40:36 +0000 (16:40 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:40:36 +0000 (16:40 +0200)
commit1ff55e12f7298322c463a2fbb422cfeac9bbbe67
tree4de82f4d8a28ae197038123a7bc297a493e7b3b2
parentba3adea9575cb95a898c738b1f231d989db659e9
parentca6ae3b77a7e6600e517723b90e57527a47809de
Merge commit 'ca6ae3b77a7e6600e517723b90e57527a47809de'

* commit 'ca6ae3b77a7e6600e517723b90e57527a47809de':
  vaapi_encode: Add MPEG-2 support

This commit is a noop, see 3b95c7c17de0c5048eb1d38454e1c88e85517067

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