[FFmpeg-cvslog] rtsp: Add rtsps to the probe
Luca Barbato
git at videolan.org
Fri Oct 10 21:44:07 CEST 2014
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Thu Oct 9 22:07:35 2014 +0200| [3df8d52fcdc9036b4074fdc612d487ece8bb5b7f] | committer: Luca Barbato
rtsp: Add rtsps to the probe
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3df8d52fcdc9036b4074fdc612d487ece8bb5b7f
---
libavformat/rtspdec.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 5dda52e..aa016c3 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -680,7 +680,11 @@ static int rtsp_listen(AVFormatContext *s)
static int rtsp_probe(AVProbeData *p)
{
- if (av_strstart(p->filename, "rtsp:", NULL))
+ if (
+#if CONFIG_TLS_PROTOCOL
+ av_strstart(p->filename, "rtsps:", NULL) ||
+#endif
+ av_strstart(p->filename, "rtsp:", NULL))
return AVPROBE_SCORE_MAX;
return 0;
}
More information about the ffmpeg-cvslog
mailing list