1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-16 08:38:24 +02:00
Files
FFmpeg/libavcodec
Michael Niedermayer 508c815d4d 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: c5327df838
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-26 22:41:18 +02:00
..
2015-07-25 14:07:55 +02:00
2015-07-26 17:18:35 +02:00
2015-07-22 23:23:29 +02:00
2015-07-20 15:06:50 +01:00
2015-07-22 21:04:17 +02:00
2015-07-20 15:06:50 +01:00
2015-07-22 16:15:53 +02:00
2015-06-28 14:51:07 +02:00
2015-07-22 21:04:17 +02:00
2015-07-01 20:30:48 +02:00
2015-06-26 23:35:26 +02:00
2015-07-22 23:23:29 +02:00
2015-07-10 16:21:50 +02:00
2015-07-22 21:04:17 +02:00
2015-07-20 15:06:50 +01:00
2015-07-20 15:06:50 +01:00