---
libavformat/allformats.c | 3 ---
libavformat/hlsproto.c | 24 ------------------------
libavformat/version.h | 3 ---
3 files changed, 30 deletions(-)
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 4aae223..6dbf9fd 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -255,9 +255,6 @@ void av_register_all(void)
REGISTER_MUXDEMUX(YUV4MPEGPIPE, yuv4mpegpipe);
/* protocols */
-#if FF_API_APPLEHTTP_PROTO
- REGISTER_PROTOCOL(APPLEHTTP, applehttp);
-#endif
REGISTER_PROTOCOL(CONCAT, concat);
REGISTER_PROTOCOL(CRYPTO, crypto);
REGISTER_PROTOCOL(FFRTMPCRYPT, ffrtmpcrypt);
diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c
index fde7191..72b6c72 100644
--- a/libavformat/hlsproto.c
+++ b/libavformat/hlsproto.c
@@ -204,19 +204,6 @@ static int hls_open(URLContext *h, const char *uri, int
flags)
nested_url);
ret = AVERROR(EINVAL);
goto fail;
-#if FF_API_APPLEHTTP_PROTO
- } else if (av_strstart(uri, "applehttp+", &nested_url)) {
- av_strlcpy(s->playlisturl, nested_url, sizeof(s->playlisturl));
- av_log(h, AV_LOG_WARNING,
- "The applehttp protocol is deprecated, use hls+%s as url "
- "instead.\n", nested_url);
- } else if (av_strstart(uri, "applehttp://";, &nested_url)) {
- av_strlcpy(s->playlisturl, "http://";, sizeof(s->playlisturl));
- av_strlcat(s->playlisturl, nested_url, sizeof(s->playlisturl));
- av_log(h, AV_LOG_WARNING,
- "The applehttp protocol is deprecated, use hls+http://%s as url
"
- "instead.\n", nested_url);
-#endif
} else {
av_log(h, AV_LOG_ERROR, "Unsupported url %s\n", uri);
ret = AVERROR(EINVAL);
@@ -326,17 +313,6 @@ retry:
goto start;
}
-#if FF_API_APPLEHTTP_PROTO
-URLProtocol ff_applehttp_protocol = {
- .name = "applehttp",
- .url_open = hls_open,
- .url_read = hls_read,
- .url_close = hls_close,
- .flags = URL_PROTOCOL_FLAG_NESTED_SCHEME,
- .priv_data_size = sizeof(HLSContext),
-};
-#endif
-
URLProtocol ff_hls_protocol = {
.name = "hls",
.url_open = hls_open,
diff --git a/libavformat/version.h b/libavformat/version.h
index c781740..7d45bf0 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -49,9 +49,6 @@
* the public API and may change, break or disappear at any time.
*/
-#ifndef FF_API_APPLEHTTP_PROTO
-#define FF_API_APPLEHTTP_PROTO (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
#ifndef FF_API_READ_PACKET
#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55)
#endif
--
1.7.10.4
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
