[FFmpeg-cvslog] Merge commit '9b4b96c0dee90d260891ec765b28f6ca15594340'

Michael Niedermayer git at videolan.org
Sun Jul 26 22:54:15 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 26 22:41:18 2015 +0200| [508c815d4db0a795444476a9e175b2e6d09bb35c] | committer: Michael Niedermayer

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 at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=508c815d4db0a795444476a9e175b2e6d09bb35c
---





More information about the ffmpeg-cvslog mailing list