[FFmpeg-cvslog] Merge commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526'

[Hendrik Leppkes]

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

Merge commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526'

* commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526':
  vdpau: deprecate av_vdpau_get_profile()

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

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