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)
* commit '8502c1e9ff9c1dbb6e467630c048d098f4064021':
  vdpau: add mapping for H.264 Extended profile

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

Simple merge
Simple merge