diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:21:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:21:43 +0100 |
| commit | 1c60956c80376884502e797f613ec24cacba3cce (patch) | |
| tree | 1618cd51870a2fc2c6a1fe312b457a0cf75fd709 /libavformat/hlsproto.c | |
| parent | ac45921a6b9dfbd3074c8a760038eca5a40eb05d (diff) | |
| parent | c7e044c61bb08b3a6e1e8063e8f4449c88b01201 (diff) | |
| download | android_external_ffmpeg-1c60956c80376884502e797f613ec24cacba3cce.tar.gz android_external_ffmpeg-1c60956c80376884502e797f613ec24cacba3cce.tar.bz2 android_external_ffmpeg-1c60956c80376884502e797f613ec24cacba3cce.zip | |
Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'
* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft
Conflicts:
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsproto.c')
| -rw-r--r-- | libavformat/hlsproto.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c index 8dedcfd7ca..4e35043a3e 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, |