Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
c7e044c6
Commit
c7e044c6
authored
Feb 23, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft
parent
0a7c4daf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
30 deletions
+0
-30
allformats.c
libavformat/allformats.c
+0
-3
hlsproto.c
libavformat/hlsproto.c
+0
-24
version.h
libavformat/version.h
+0
-3
No files found.
libavformat/allformats.c
View file @
c7e044c6
...
...
@@ -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
);
...
...
libavformat/hlsproto.c
View file @
c7e044c6
...
...
@@ -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
,
...
...
libavformat/version.h
View file @
c7e044c6
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment