1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
FFmpeg/libavcodec
Michael Niedermayer 14617e3a73 Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'
* commit '172b2cee17a3779c114ba065dd7b25dcf61e408f':
  dxva2: Add ifdefs around structs that might not be available

Conflicts:
	libavcodec/dxva2.c

See: 94d07b314aa516284cc21ea720d4a305f881b6c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01 23:06:32 +02:00
..
2015-05-13 01:59:51 +02:00
2015-05-28 16:10:56 +02:00
2015-05-28 01:01:16 +02:00
2015-06-01 11:36:30 +03:00
2015-06-01 11:36:22 +03:00
2015-05-31 15:03:31 +02:00
2015-05-25 16:08:08 +02:00
2015-05-31 15:03:31 +02:00
2015-05-31 15:03:31 +02:00
2015-05-20 15:50:58 +02:00
2015-05-13 00:41:38 +02:00
2015-05-31 15:03:31 +02:00