[FFmpeg-cvslog] Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 14 22:51:27 2015 +0100| [e33b084ee98664d8f467ea16cdf75643d167b089] | committer: Michael Niedermayer

Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'

* commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f':
  vdpau: Adjust necessary #includes for vdpau_internal.h

Conflicts:
	libavcodec/vdpau_internal.h

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

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