[FFmpeg-cvslog] Merge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  5 11:48:39 2014 +0100| [a44a27b5c81759d908ee85908b4a136971c5014e] | committer: Michael Niedermayer

Merge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'

* commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c':
  av_vdpau_get_profile: mask out H.264 intra profile flag

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

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