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
0e491182
Commit
0e491182
authored
Apr 09, 2018
by
Jun Zhao
Committed by
Jun Zhao
Apr 12, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/hls: use ff_get_chomp_line
Signed-off-by:
Jun Zhao
<
mypopydev@gmail.com
>
parent
cdd107b9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
10 deletions
+2
-10
hls.c
libavformat/hls.c
+2
-10
No files found.
libavformat/hls.c
View file @
0e491182
...
@@ -216,14 +216,6 @@ typedef struct HLSContext {
...
@@ -216,14 +216,6 @@ typedef struct HLSContext {
AVIOContext
*
playlist_pb
;
AVIOContext
*
playlist_pb
;
}
HLSContext
;
}
HLSContext
;
static
int
read_chomp_line
(
AVIOContext
*
s
,
char
*
buf
,
int
maxlen
)
{
int
len
=
ff_get_line
(
s
,
buf
,
maxlen
);
while
(
len
>
0
&&
av_isspace
(
buf
[
len
-
1
]))
buf
[
--
len
]
=
'\0'
;
return
len
;
}
static
void
free_segment_list
(
struct
playlist
*
pls
)
static
void
free_segment_list
(
struct
playlist
*
pls
)
{
{
int
i
;
int
i
;
...
@@ -770,7 +762,7 @@ static int parse_playlist(HLSContext *c, const char *url,
...
@@ -770,7 +762,7 @@ static int parse_playlist(HLSContext *c, const char *url,
if
(
av_opt_get
(
in
,
"location"
,
AV_OPT_SEARCH_CHILDREN
,
&
new_url
)
>=
0
)
if
(
av_opt_get
(
in
,
"location"
,
AV_OPT_SEARCH_CHILDREN
,
&
new_url
)
>=
0
)
url
=
new_url
;
url
=
new_url
;
read
_chomp_line
(
in
,
line
,
sizeof
(
line
));
ff_get
_chomp_line
(
in
,
line
,
sizeof
(
line
));
if
(
strcmp
(
line
,
"#EXTM3U"
))
{
if
(
strcmp
(
line
,
"#EXTM3U"
))
{
ret
=
AVERROR_INVALIDDATA
;
ret
=
AVERROR_INVALIDDATA
;
goto
fail
;
goto
fail
;
...
@@ -782,7 +774,7 @@ static int parse_playlist(HLSContext *c, const char *url,
...
@@ -782,7 +774,7 @@ static int parse_playlist(HLSContext *c, const char *url,
pls
->
type
=
PLS_TYPE_UNSPECIFIED
;
pls
->
type
=
PLS_TYPE_UNSPECIFIED
;
}
}
while
(
!
avio_feof
(
in
))
{
while
(
!
avio_feof
(
in
))
{
read
_chomp_line
(
in
,
line
,
sizeof
(
line
));
ff_get
_chomp_line
(
in
,
line
,
sizeof
(
line
));
if
(
av_strstart
(
line
,
"#EXT-X-STREAM-INF:"
,
&
ptr
))
{
if
(
av_strstart
(
line
,
"#EXT-X-STREAM-INF:"
,
&
ptr
))
{
is_variant
=
1
;
is_variant
=
1
;
memset
(
&
variant_info
,
0
,
sizeof
(
variant_info
));
memset
(
&
variant_info
,
0
,
sizeof
(
variant_info
));
...
...
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