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)
* commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816':
  vdpau: add mapping for H.264 Constrained Baseline profile and fallback

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

Simple merge
Simple merge