ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri May 22 11:52:21 2015 +0200| [1617a89cf000cfb811c1c1ae4119321f41b9fbf7] | committer: Michael Niedermayer
Merge commit '29216d7fd14d1cec16821867d17c90b5c49e8c07' * commit '29216d7fd14d1cec16821867d17c90b5c49e8c07': tls: fix compilation when both gnutls and openssl are enabled See: e91fbfd9cf17270d78c73add53fada4c217fdb5e Merged-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1617a89cf000cfb811c1c1ae4119321f41b9fbf7 --- _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
