[FFmpeg-cvslog] Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'

[Michael Niedermayer]

On Fri, Sep 27, 2013 at 07:36:47PM +0800, Geek.Song wrote:
> On Fri, Sep 27, 2013 at 5:39 PM, Michael Niedermayer <git at videolan.org>wrote:
> 
> > 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
> >
> >
> This commit breaks the code
> 
> ++    } else if (c->cert_file || c->key_file) {
> ++        av_log(h, AV_LOG_ERROR, "cert and key required\n");
> 
> it lost the right ‘}’ for ''else if "

fixed

i had tested it with openssl but forgot testing with gnutls


[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. User
questions about the command line tools should be sent to the ffmpeg-user ML.
And questions about how to use libav* should be sent to the libav-user ML.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20130927/14fdc3f7/attachment.asc>