diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-23 08:20:12 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-11 18:22:54 +0100 |
| commit | c7e044c61bb08b3a6e1e8063e8f4449c88b01201 (patch) | |
| tree | afc56ddb5c29e5e0c746d5aaf0622a71b9b13436 | |
| parent | 0a7c4daf469d4ac447fb822fe78337f62f4c04e6 (diff) | |
lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft
| -rw-r--r-- | libavformat/allformats.c | 3 | ||||
| -rw-r--r-- | libavformat/hlsproto.c | 24 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 30 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 4aae223c68..6dbf9fda04 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 fde7191c35..72b6c7236f 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 c781740ca6..7d45bf00ba 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 |