[FFmpeg-cvslog] Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'
Michael Niedermayer
git at videolan.org
Tue Jun 2 22:57:30 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 2 22:41:53 2015 +0200| [21e40f006aac36e41d3d6074928d584f0be51ada] | committer: Michael Niedermayer
Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'
* commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de':
configure: don't enable tls protocols if network is disabled
Conflicts:
configure
See: 7fc6545d5d7301196d1c23a45a24a9707bac0060
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21e40f006aac36e41d3d6074928d584f0be51ada
---
More information about the ffmpeg-cvslog
mailing list