Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 20:58:57 +0000 (22:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 21:06:32 +0000 (23:06 +0200)
commit14617e3a739ea23e8da9adcdca4418f2b14a3956
treedac93fcbac626cf67282e92da13078f806c10fe7
parent7fc6545d5d7301196d1c23a45a24a9707bac0060
parent172b2cee17a3779c114ba065dd7b25dcf61e408f
Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'

* commit '172b2cee17a3779c114ba065dd7b25dcf61e408f':
  dxva2: Add ifdefs around structs that might not be available

Conflicts:
libavcodec/dxva2.c

See: 94d07b314aa516284cc21ea720d4a305f881b6c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxva2.c