[FFmpeg-cvslog] Merge commit 'cfa4eb4fba782f3f37a33be997b27a91a07053c9'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr 29 12:46:00 2017 +0200| [5729acee8214170f212b6409ac363428152d05ff] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5729acee8214170f212b6409ac363428152d05ff
---