ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Jun 1
22:58:57 2015 +0200| [14617e3a739ea23e8da9adcdca4418f2b14a3956] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14617e3a739ea23e8da9adcdca4418f2b14a3956
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
