Commit 76d1ffff authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3df8d52f'

* commit '3df8d52f':
  rtsp: Add rtsps to the probe
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7028475f 3df8d52f
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment