[FFmpeg-devel] [PATCH] libavformat/rtsp: Fix rtsps, do not force tcp transport

[Michael Niedermayer]

On Thu, Jan 21, 2016 at 10:23:52AM +0100, Yannick Poirier wrote:
> 
> rtsp over ssl is not working. tls does not implement prot->url_get_file_handle so ffurl_get_file_handle() fails.
> struct sockaddr_storage peer is initialized but not used, remove it.
> rtsps lower transport was set to TCP. Transport could be UDP. It permits to use RTSPS + SRTP.
> 
> ---
>  libavformat/rtsp.c | 15 +--------------
>  1 file changed, 1 insertion(+), 14 deletions(-)

this patch doesnt apply cleanly

Applying: libavformat/rtsp: Fix rtsps, do not force tcp transport
Using index info to reconstruct a base tree...
error: patch failed: libavformat/rtsp.c:1651
error: libavformat/rtsp.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.

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

Awnsering whenever a program halts or runs forever is
On a turing machine, in general impossible (turings halting problem).
On any real computer, always possible as a real computer has a finite number
of states N, and will either halt in less than N cycles or never halt.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160126/a4ddcc9c/attachment.sig>