Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
56a345ef
Commit
56a345ef
authored
Jan 20, 2012
by
Hugo Beauzée-Luyssen
Committed by
Jean-Baptiste Kempf
Jan 23, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hls: Don't fail when a STREAM-INF is commented.
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
9ffcb9c5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
18 deletions
+26
-18
modules/stream_filter/httplive.c
modules/stream_filter/httplive.c
+26
-18
No files found.
modules/stream_filter/httplive.c
View file @
56a345ef
...
...
@@ -1034,27 +1034,35 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams, uint8_t *buffer, const
err
=
VLC_ENOMEM
;
else
{
hls_stream_t
*
hls
=
NULL
;
err
=
parse_StreamInformation
(
s
,
&
streams
,
&
hls
,
line
,
uri
);
free
(
uri
);
/* Download playlist file from server */
uint8_t
*
buf
=
NULL
;
ssize_t
len
=
read_M3U8_from_url
(
s
,
&
hls
->
url
,
&
buf
);
if
(
len
<
0
)
err
=
VLC_EGENERIC
;
else
if
(
*
uri
==
'#'
)
{
/* Parse HLS m3u8 content. */
err
=
parse_M3U8
(
s
,
streams
,
buf
,
len
);
free
(
buf
);
msg_Info
(
s
,
"Skipping invalid stream-inf: %s"
,
uri
);
free
(
uri
);
}
if
(
hls
)
else
{
hls
->
version
=
version
;
if
(
!
p_sys
->
b_live
)
hls
->
size
=
hls_GetStreamSize
(
hls
);
/* Stream size (approximate) */
hls_stream_t
*
hls
=
NULL
;
err
=
parse_StreamInformation
(
s
,
&
streams
,
&
hls
,
line
,
uri
);
free
(
uri
);
/* Download playlist file from server */
uint8_t
*
buf
=
NULL
;
ssize_t
len
=
read_M3U8_from_url
(
s
,
&
hls
->
url
,
&
buf
);
if
(
len
<
0
)
err
=
VLC_EGENERIC
;
else
{
/* Parse HLS m3u8 content. */
err
=
parse_M3U8
(
s
,
streams
,
buf
,
len
);
free
(
buf
);
}
if
(
hls
)
{
hls
->
version
=
version
;
if
(
!
p_sys
->
b_live
)
hls
->
size
=
hls_GetStreamSize
(
hls
);
/* Stream size (approximate) */
}
}
}
p_begin
=
p_read
;
...
...
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