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
45ec2e44
Commit
45ec2e44
authored
Dec 29, 2017
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/hls: migrate to AVFormatContext->url
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
4bb04098
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
96 additions
and
74 deletions
+96
-74
hls.c
libavformat/hls.c
+2
-2
hlsenc.c
libavformat/hlsenc.c
+94
-72
No files found.
libavformat/hls.c
View file @
45ec2e44
...
...
@@ -1682,7 +1682,7 @@ static int nested_io_open(AVFormatContext *s, AVIOContext **pb, const char *url,
av_log
(
s
,
AV_LOG_ERROR
,
"A HLS playlist item '%s' referred to an external file '%s'. "
"Opening this file was forbidden for security reasons
\n
"
,
s
->
filename
,
url
);
s
->
url
,
url
);
return
AVERROR
(
EPERM
);
}
...
...
@@ -1820,7 +1820,7 @@ static int hls_read_header(AVFormatContext *s)
update_options
(
&
c
->
http_proxy
,
"http_proxy"
,
u
);
}
if
((
ret
=
parse_playlist
(
c
,
s
->
filename
,
NULL
,
s
->
pb
))
<
0
)
if
((
ret
=
parse_playlist
(
c
,
s
->
url
,
NULL
,
s
->
pb
))
<
0
)
goto
fail
;
if
((
ret
=
save_avio_options
(
s
))
<
0
)
...
...
libavformat/hlsenc.c
View file @
45ec2e44
This diff is collapsed.
Click to expand it.
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