summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
Diffstat (limited to 'stream')
-rw-r--r--stream/http.c4
-rw-r--r--stream/stream_lavf.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/stream/http.c b/stream/http.c
index 8b71435d2f..11fe7ed6de 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -938,7 +938,7 @@ const stream_info_t stream_info_http1 = {
"Bertrand, Albeau, Reimar Doeffinger, Arpi?",
"plain http",
open_s1,
- {"http", "http_proxy", "unsv", "icyx", "noicyx", NULL},
+ {"mp_http", "mp_http_proxy", "unsv", "icyx", "noicyx", NULL},
NULL,
0 // Urls are an option string
};
@@ -949,7 +949,7 @@ const stream_info_t stream_info_http2 = {
"Bertrand, Albeu, Arpi? who?",
"plain http, also used as fallback for many other protocols",
open_s2,
- {"http", "http_proxy", "pnm", "mms", "mmsu", "mmst", "rtsp", NULL}, //all the others as fallback
+ {"mp_http", "mp_http_proxy", "pnm", "mms", "mmsu", "mmst", "rtsp", NULL}, //all the others as fallback
NULL,
0 // Urls are an option string
};
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index 6e5f70ae83..4c7e5a7c40 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -152,6 +152,8 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format)
stream->write_buffer = write_buffer;
stream->control = control;
stream->close = close_f;
+ // enable cache (should be avoided for files, but no way to detect this)
+ stream->streaming = true;
res = STREAM_OK;
out:
@@ -164,7 +166,7 @@ const stream_info_t stream_info_ffmpeg = {
"",
"",
open_f,
- { "lavf", "ffmpeg", "rtmp", "rtsp", NULL },
+ { "lavf", "ffmpeg", "rtmp", "rtsp", "http", "https", NULL },
NULL,
1 // Urls are an option string
};