Merge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 May 2013 14:28:09 +0000 (16:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 May 2013 14:28:18 +0000 (16:28 +0200)
commit2d8dddd92659ba3bd923fee4bfa4618f4a6f2ead
tree056a73aabfc45b1a951e50d25f6311ccc824735c
parentfb90e7b86d02d34b60f1f3e9cafb2ea136c82a86
parentfe1f36547d0be963e352de0cde1a6cba59ea2e78
Merge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg

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