Merge commit '6aa4ba7131b6e8668e33430e18101a051fe492eb'
authorClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 11:55:50 +0000 (13:55 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 11:55:50 +0000 (13:55 +0200)
* commit '6aa4ba7131b6e8668e33430e18101a051fe492eb':
  dxva2: Keep code shared between dxva2 and d3d11va under the correct #if

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

Simple merge