summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-26 22:41:18 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-26 22:41:18 +0200
commit508c815d4db0a795444476a9e175b2e6d09bb35c (patch)
tree3152793d85c5a6c4ad684e072eb541f84172a023 /configure
parentdc07e576ce72814c79c4e5a9ea2805291296a3f5 (diff)
parent9b4b96c0dee90d260891ec765b28f6ca15594340 (diff)
Merge commit '9b4b96c0dee90d260891ec765b28f6ca15594340'
* commit '9b4b96c0dee90d260891ec765b28f6ca15594340': force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h Conflicts: libavcodec/dxva2_internal.h See: c5327df838396e7c43a56bdd141c0f01ba3edc94 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'configure')
0 files changed, 0 insertions, 0 deletions