diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 21:36:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 21:36:27 +0200 |
| commit | 76d1ffffd0b2433c44ac48b8939337294566218b (patch) | |
| tree | 30f90af9964dc65194f5567b0da1174f60314b2b /libavformat/rtspdec.c | |
| parent | 7028475f75336a11ca7bbfd30405d342eaa63354 (diff) | |
| parent | 3df8d52fcdc9036b4074fdc612d487ece8bb5b7f (diff) | |
| download | ffmpeg-76d1ffffd0b2433c44ac48b8939337294566218b.tar.gz | |
Merge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f'
* commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f':
rtsp: Add rtsps to the probe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtspdec.c')
| -rw-r--r-- | libavformat/rtspdec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 39fe1da4d1..cf073b30ed 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -682,7 +682,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; } |