ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Wed Nov 1 18:45:23 2017 -0300| [070336b89b0b7321f31f68dc1e430f85fa188e83] | committer: James Almer
Merge commit 'ed434be106a4615e0419b3ac7664220741afda2d' * commit 'ed434be106a4615e0419b3ac7664220741afda2d': configure: Bail out if both GnuTLS and OpenSSL are enabled configure: Move x86 assembler sanity check into assembler probe function build: Add missing zlib dependencies for several protocols This commit is a noop, see 6dfcbd80ad446ff163b47f2bf432bbf706436ea8 5cae5a1defa360da076365a786093a749d1ddf4e 4600b0619afc58b58de1a21d7a2c472e0d788282 Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=070336b89b0b7321f31f68dc1e430f85fa188e83 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
