generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'

Browse Source 
* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
  lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft

Conflicts:
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-03-13 12:21:43 +01:00
parent ac45921a6b c7e044c61b
commit 1c60956c80
3 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/allformats.c
View File

@@ -300,9 +300,6 @@ void av_register_all(void)
REGISTER_MUXDEMUX(YUV4MPEGPIPE, yuv4mpegpipe); REGISTER_MUXDEMUX(YUV4MPEGPIPE, yuv4mpegpipe);
/* protocols */ /* protocols */
#if FF_API_APPLEHTTP_PROTO
REGISTER_PROTOCOL(APPLEHTTP, applehttp);
#endif
REGISTER_PROTOCOL(BLURAY, bluray); REGISTER_PROTOCOL(BLURAY, bluray);
REGISTER_PROTOCOL(CACHE, cache); REGISTER_PROTOCOL(CACHE, cache);
REGISTER_PROTOCOL(CONCAT, concat); REGISTER_PROTOCOL(CONCAT, concat);

24
libavformat/hlsproto.c
View File

@@ -204,19 +204,6 @@ static int hls_open(URLContext *h, const char *uri, int flags)
nested_url); nested_url);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; 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 { } else {
av_log(h, AV_LOG_ERROR, "Unsupported url %s\n", uri); av_log(h, AV_LOG_ERROR, "Unsupported url %s\n", uri);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
@@ -326,17 +313,6 @@ retry:
goto start; 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 = { URLProtocol ff_hls_protocol = {
.name = "hls", .name = "hls",
.url_open = hls_open, .url_open = hls_open,

3
libavformat/version.h
View File

@@ -70,9 +70,6 @@
#ifndef FF_API_CLOSE_INPUT_FILE #ifndef FF_API_CLOSE_INPUT_FILE
#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56) #define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_APPLEHTTP_PROTO
#define FF_API_APPLEHTTP_PROTO (LIBAVFORMAT_VERSION_MAJOR < 55)
#endif
#ifndef FF_API_READ_PACKET #ifndef FF_API_READ_PACKET
#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55) #define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55)
#endif #endif