[FFmpeg-cvslog] Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 10 21:18:41 2014 +0200| [c9791925a1bfad19d47a3ca611c5f1b602d67c16] | committer: Michael Niedermayer

Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9'

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

Conflicts:
	libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9791925a1bfad19d47a3ca611c5f1b602d67c16
---