Merge commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1'
authorClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 08:32:45 +0000 (10:32 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 08:32:45 +0000 (10:32 +0200)
* commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1':
  dxva2: Simplify some ifdefs

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/dxva2_internal.h

Simple merge