[FFmpeg-cvslog] Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  5 10:32:10 2013 +0100| [e1459f4b0bb2482c40b458183f78feadb8fe417b] | committer: Michael Niedermayer

Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'

* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
  vdpau: Add missing #includes to fix standalone header compilation

Conflicts:
	libavcodec/vdpau_internal.h

Not completely merged as this would break use of vdpau.h from C++

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

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