Merge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Dec 2014 21:22:19 +0000 (22:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Dec 2014 21:23:53 +0000 (22:23 +0100)
commit27f2e211aa6d0f9b5b4e4c04d3a3567423085d49
treec0ec7ce6076e8ecf338c1c67d738deac2aee55f9
parent3f679f73a2eee1937bd58e6ec5739d29b1a05e7f
parent559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816
Merge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'

* commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816':
  vdpau: add mapping for H.264 Constrained Baseline profile and fallback

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