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)
commitbb71eb944c7abe4eccb6b21d4771751feca22980
treee409a8ba94968d7ed094c9eb311dc0bfc21b620d
parentcc8cafae8775496a5a62285ad828db2d7fc1e7d8
parentac648bb835edd3f67bda2267d0e72e5e582eb5a1
Merge commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1'

* commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1':
  dxva2: Simplify some ifdefs

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