[FFmpeg-cvslog] Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep  1 20:29:38 2014 +0200| [052cd1ce720406918181c00418609fc6c8697e3a] | committer: Michael Niedermayer

Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098'

* commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098':
  dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()

Conflicts:
	libavcodec/dxva2_h264.c
	libavcodec/dxva2_mpeg2.c
	libavcodec/dxva2_vc1.c

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

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