Merge commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Dec 2014 21:07:08 +0000 (22:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Dec 2014 21:07:41 +0000 (22:07 +0100)
commit0b30d186f1a2ddee583e7917cd0a48ca113849ab
tree31736cefc456019f9246af27bb8937ae444b47cd
parentadd040ff01cd325dde30e43bda5d603c99f27e8a
parent8b51bcfed75721e0d20832e5a90e1d585318c9d9
Merge commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9'

* commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9':
  vdpau: revector macro to reduce line span

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vdpau.c