-
Michael Niedermayer authored
* commit '9b4b96c0': force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h Conflicts: libavcodec/dxva2_internal.h See: c5327df8Merged-by: Michael Niedermayer <michael@niedermayer.cc>
508c815d
* commit '9b4b96c0': force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h Conflicts: libavcodec/dxva2_internal.h See: c5327df8Merged-by: Michael Niedermayer <michael@niedermayer.cc>