[FFmpeg-cvslog] Merge commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58'
Michael Niedermayer
git at videolan.org
Sat Dec 20 01:12:56 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 00:49:12 2014 +0100| [3d6545d51e6c031a77b0abf7470c681034dd8193] | committer: Michael Niedermayer
Merge commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58'
* commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58':
libavformat: Only use MoveFileExA when targeting the desktop API subset
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d6545d51e6c031a77b0abf7470c681034dd8193
---
More information about the ffmpeg-cvslog
mailing list