Merge commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 15:22:14 +0000 (16:22 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 15:22:14 +0000 (16:22 +0100)
commit09dc6845662b74edb310c2088ffa4bb07c24fd76
treeda0ea0942aaa384c3f0684efc201f9db7e0b5f53
parentfeb1f7abc5873e2be6143c94e423315b57a159ef
parente10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0
Merge commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0'

* commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0':
  vdpau: Add missing deprecation guards

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/vdpau.c