[FFmpeg-cvslog] Merge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 14 22:22:19 2014 +0100| [27f2e211aa6d0f9b5b4e4c04d3a3567423085d49] | committer: Michael Niedermayer

Merge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27f2e211aa6d0f9b5b4e4c04d3a3567423085d49
---