[FFmpeg-cvslog] Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'
Michael Niedermayer
git at videolan.org
Sun Jul 26 23:30:22 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 26 23:19:56 2015 +0200| [27e61a716c893a6ae67ca8f859c735bc0b0b799a] | committer: Michael Niedermayer
Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'
* commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a':
configure: Only redefine inline to __inline for msvc if necessary
Conflicts:
configure
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27e61a716c893a6ae67ca8f859c735bc0b0b799a
---
More information about the ffmpeg-cvslog
mailing list