OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c839b04
)
rtsp: Add rtsps to the probe
author
Luca Barbato
<lu_zero@gentoo.org>
Thu, 9 Oct 2014 20:07:35 +0000
(22:07 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Fri, 10 Oct 2014 14:29:06 +0000
(16:29 +0200)
libavformat/rtspdec.c
patch
|
blob
|
history
diff --git
a/libavformat/rtspdec.c
b/libavformat/rtspdec.c
index
5dda52e
..
aa016c3
100644
(file)
--- 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;
}