[FFmpeg-cvslog] Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'

[Geek.Song]

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 "

-----------------------------------------------------------------------------------------
My key fingerprint: d1:03:f5:32:26:ff:d7:3c:e4:42:e3:51:ec:92:78:b2