Merge commit 'bef067f88c74190cdf7e76d12f02e12e069974aa'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 13:11:46 +0000 (15:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 13:12:19 +0000 (15:12 +0200)
* commit 'bef067f88c74190cdf7e76d12f02e12e069974aa':
  vdpau: check video surface and decoder capabilities

Merged-by: Michael Niedermayer <michaelni@gmx.at>

No differences found