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
f1ccb4db
Commit
f1ccb4db
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/hlsenc: use ff_get_chomp_line
Signed-off-by:
Jun Zhao
<
mypopydev@gmail.com
>
parent
0e491182
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
10 deletions
+2
-10
hlsenc.c
libavformat/hlsenc.c
+2
-10
No files found.
libavformat/hlsenc.c
View file @
f1ccb4db
...
...
@@ -696,14 +696,6 @@ static int hls_encryption_start(AVFormatContext *s)
return
0
;
}
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
int
hls_mux_init
(
AVFormatContext
*
s
,
VariantStream
*
vs
)
{
AVDictionary
*
options
=
NULL
;
...
...
@@ -1072,7 +1064,7 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs
s
->
protocol_whitelist
,
s
->
protocol_blacklist
))
<
0
)
return
ret
;
read
_chomp_line
(
in
,
line
,
sizeof
(
line
));
ff_get
_chomp_line
(
in
,
line
,
sizeof
(
line
));
if
(
strcmp
(
line
,
"#EXTM3U"
))
{
ret
=
AVERROR_INVALIDDATA
;
goto
fail
;
...
...
@@ -1080,7 +1072,7 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs
vs
->
discontinuity
=
0
;
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-MEDIA-SEQUENCE:"
,
&
ptr
))
{
int64_t
tmp_sequence
=
strtoll
(
ptr
,
NULL
,
10
);
if
(
tmp_sequence
<
vs
->
sequence
)
...
...
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