[FFmpeg-cvslog] Merge commit 'a41e5e192ed8f79f6607f978dee3205580ba5039'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep 29 13:45:38 2015 +0200| [d0bf83ff1dd3a3858a299cc4795ede14b335cc1c] | committer: Hendrik Leppkes

Merge commit 'a41e5e192ed8f79f6607f978dee3205580ba5039'

* commit 'a41e5e192ed8f79f6607f978dee3205580ba5039':
  vdpau: fix constrained baseline fallback

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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