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)
commit5eba94a8c392be44a868183cdacff9a38fe55448
tree0402d9c1ac96982a7665a66d30318fe775ed5740
parentf6e8d54fcc17660a8c34512bdc73541664942a5f
parent6aa4ba7131b6e8668e33430e18101a051fe492eb
Merge commit '6aa4ba7131b6e8668e33430e18101a051fe492eb'

* commit '6aa4ba7131b6e8668e33430e18101a051fe492eb':
  dxva2: Keep code shared between dxva2 and d3d11va under the correct #if

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