Merge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Dec 2014 21:14:36 +0000 (22:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Dec 2014 21:14:58 +0000 (22:14 +0100)
commit3f679f73a2eee1937bd58e6ec5739d29b1a05e7f
treeebf7db98d22e08a817094f58186c7b98fd38d07c
parent0b30d186f1a2ddee583e7917cd0a48ca113849ab
parent8502c1e9ff9c1dbb6e467630c048d098f4064021
Merge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'

* commit '8502c1e9ff9c1dbb6e467630c048d098f4064021':
  vdpau: add mapping for H.264 Extended profile

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