[FFmpeg-cvslog] Merge commit '31de41babcd96f8ac2e6632454737aecb3710df7'
Michael Niedermayer
git at videolan.org
Mon Jun 1 17:19:59 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 1 17:09:25 2015 +0200| [3f36607ef0dfa2c11ae6d90959b8f94c8b429d68] | committer: Michael Niedermayer
Merge commit '31de41babcd96f8ac2e6632454737aecb3710df7'
* commit '31de41babcd96f8ac2e6632454737aecb3710df7':
configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va
Conflicts:
configure
See: a838b22bd9f75028cdfb55bf9b322b3f3544421b
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f36607ef0dfa2c11ae6d90959b8f94c8b429d68
---
More information about the ffmpeg-cvslog
mailing list