diff mbox

[FFmpeg-devel] lavf/avio: Print https warning also for avio_find_protocol_name()

Message ID CAB0OVGrkR6tC7mj-sh5n_GngCDOkPkbA_H0kXVWVjp_hGtLRVQ@mail.gmail.com
State Accepted
Headers show

Commit Message

Carl Eugen Hoyos Sept. 25, 2019, 12:11 p.m. UTC
Am Mi., 25. Sept. 2019 um 11:35 Uhr schrieb Carl Eugen Hoyos
<ceffmpeg@gmail.com>:
>
> Hi!
>
> Attached patch helps users fixing ticket #8197.
>
> Please comment, Carl Eugen

Comments

Steven Liu Sept. 26, 2019, 1:48 a.m. UTC | #1
> 在 2019年9月25日,下午8:11,Carl Eugen Hoyos <ceffmpeg@gmail.com> 写道:
> 
> Am Mi., 25. Sept. 2019 um 11:35 Uhr schrieb Carl Eugen Hoyos
> <ceffmpeg@gmail.com>:
>> 
>> Hi!
>> 
>> Attached patch helps users fixing ticket #8197.

LGTM
>> 
>> Please comment, Carl Eugen


Thanks
Steven
Carl Eugen Hoyos Oct. 1, 2019, 5:54 p.m. UTC | #2
Am Do., 26. Sept. 2019 um 03:48 Uhr schrieb Liu Steven <lq@chinaffmpeg.org>:
>
>
>
> > 在 2019年9月25日,下午8:11,Carl Eugen Hoyos <ceffmpeg@gmail.com> 写道:
> >
> > Am Mi., 25. Sept. 2019 um 11:35 Uhr schrieb Carl Eugen Hoyos
> > <ceffmpeg@gmail.com>:
> >>
> >> Hi!
> >>
> >> Attached patch helps users fixing ticket #8197.
>
> LGTM

Patch applied.

Thank you, Carl Eugen
diff mbox

Patch

From 92a62e4f56f4820d79529060636e0382b33b376b Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Wed, 25 Sep 2019 11:32:57 +0200
Subject: [PATCH] lavf/avio: Print https warning also for
 avio_find_protocol_name().

Helps to fix ticket #8197.
---
 libavformat/avio.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 663789ec02..c1bad312cd 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -283,6 +283,9 @@  static const struct URLProtocol *url_find_protocol(const char *filename)
         }
     }
     av_freep(&protocols);
+    if (av_strstart(filename, "https:", NULL) || av_strstart(filename, "tls:", NULL))
+        av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile FFmpeg with "
+                                     "openssl, gnutls or securetransport enabled.\n");
 
     return NULL;
 }
@@ -297,10 +300,6 @@  int ffurl_alloc(URLContext **puc, const char *filename, int flags,
        return url_alloc_for_protocol(puc, p, filename, flags, int_cb);
 
     *puc = NULL;
-    if (av_strstart(filename, "https:", NULL) || av_strstart(filename, "tls:", NULL))
-        av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile FFmpeg with "
-                                     "openssl, gnutls "
-                                     "or securetransport enabled.\n");
     return AVERROR_PROTOCOL_NOT_FOUND;
 }
 
-- 
2.23.0