]> git.sesse.net Git - ffmpeg/commit
Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Sep 2013 09:21:42 +0000 (11:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Sep 2013 09:33:19 +0000 (11:33 +0200)
commitf31c36e552663b11c49431745b8e75a0d3000539
tree9072c709ffe783a8835dca5b450ea04e77a4cad2
parent689a1bd917d528c9a84cc1a998159eb31e98ea79
parent705b748e8d8612385c96428ae36ed0d42a170d93
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@gmx.at>
doc/protocols.texi
libavformat/tls.c
libavformat/version.h