Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Oct 2014 19:18:41 +0000 (21:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Oct 2014 19:18:41 +0000 (21:18 +0200)
commitc9791925a1bfad19d47a3ca611c5f1b602d67c16
treef7e6c58c71f1016923989bf224b4c3e1bc91a071
parent544f8114534457e2d2ea04aaffa3b4986d6c8130
parent8b2e9636c57b22582143467a8a06b509b47b92f9
Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9'

* commit '8b2e9636c57b22582143467a8a06b509b47b92f9':
  rtsp: Support tls-encapsulated RTSP

Conflicts:
libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtsp.c
libavformat/rtsp.h