Merge commit 'cfa4eb4fba782f3f37a33be997b27a91a07053c9'
authorClément Bœsch <u@pkh.me>
Sat, 29 Apr 2017 10:46:00 +0000 (12:46 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 29 Apr 2017 10:46:00 +0000 (12:46 +0200)
commit5729acee8214170f212b6409ac363428152d05ff
treeaa69dc053854466ebee89ebaaa0e7ca6a012fe42
parentb893f3f54333eebd4909d447852e98615af785a9
parentcfa4eb4fba782f3f37a33be997b27a91a07053c9
Merge commit 'cfa4eb4fba782f3f37a33be997b27a91a07053c9'

* commit 'cfa4eb4fba782f3f37a33be997b27a91a07053c9':
  vaapi_decode: use the correct logging context

This commit is a noop, see 79307ae56374b35cf12563a7c8e3e759658f847e

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