Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 18:29:38 +0000 (20:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 18:31:13 +0000 (20:31 +0200)
commit052cd1ce720406918181c00418609fc6c8697e3a
treec524a5fec84ca7ffcbbd14e6cb84d05cc24e7e35
parentb01d2a5533a99cbd803159a4a7f365d12a0bc5c5
parent4600a85eaa6182e5a27464f6b9cae5a9ddbf3098
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@gmx.at>
libavcodec/dxva2_h264.c
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c