[FFmpeg-cvslog] Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'
Michael Niedermayer
git at videolan.org
Fri Sep 27 11:39:18 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 27 11:21:42 2013 +0200| [f31c36e552663b11c49431745b8e75a0d3000539] | committer: Michael Niedermayer
Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'
* commit '705b748e8d8612385c96428ae36ed0d42a170d93':
tls: Add support for listen mode
Conflicts:
doc/protocols.texi
libavformat/tls.c
libavformat/version.h
See: 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f31c36e552663b11c49431745b8e75a0d3000539
---
More information about the ffmpeg-cvslog
mailing list