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
bcbad8c7
Commit
bcbad8c7
authored
Jan 23, 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: Fixing some locks.
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
04f73b95
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
modules/stream_filter/httplive.c
modules/stream_filter/httplive.c
+4
-4
No files found.
modules/stream_filter/httplive.c
View file @
bcbad8c7
...
@@ -1360,11 +1360,11 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t *
...
@@ -1360,11 +1360,11 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t *
segment_t
*
segment
=
segment_Find
(
*
hls
,
p
->
sequence
);
segment_t
*
segment
=
segment_Find
(
*
hls
,
p
->
sequence
);
if
(
segment
)
if
(
segment
)
{
{
vlc_mutex_lock
(
&
segment
->
lock
);
assert
(
p
->
url
.
psz_path
);
assert
(
p
->
url
.
psz_path
);
assert
(
segment
->
url
.
psz_path
);
assert
(
segment
->
url
.
psz_path
);
vlc_mutex_lock
(
&
segment
->
lock
);
/* they should be the same */
/* they should be the same */
if
((
p
->
sequence
!=
segment
->
sequence
)
||
if
((
p
->
sequence
!=
segment
->
sequence
)
||
(
p
->
duration
!=
segment
->
duration
)
||
(
p
->
duration
!=
segment
->
duration
)
||
...
@@ -1382,6 +1382,7 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t *
...
@@ -1382,6 +1382,7 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t *
{
{
msg_Err
(
s
,
"Failed updating segment %d - skipping it"
,
p
->
sequence
);
msg_Err
(
s
,
"Failed updating segment %d - skipping it"
,
p
->
sequence
);
segment_Free
(
p
);
segment_Free
(
p
);
vlc_mutex_unlock
(
&
segment
->
lock
);
continue
;
continue
;
}
}
segment
->
sequence
=
p
->
sequence
;
segment
->
sequence
=
p
->
sequence
;
...
@@ -1396,11 +1397,10 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t *
...
@@ -1396,11 +1397,10 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t *
}
}
free
(
segment
->
psz_key_path
);
free
(
segment
->
psz_key_path
);
segment
->
psz_key_path
=
p
->
psz_key_path
?
strdup
(
p
->
psz_key_path
)
:
NULL
;
segment
->
psz_key_path
=
p
->
psz_key_path
?
strdup
(
p
->
psz_key_path
)
:
NULL
;
vlc_mutex_unlock
(
&
segment
->
lock
);
segment_Free
(
p
);
segment_Free
(
p
);
free
(
psz_url
);
free
(
psz_url
);
}
}
vlc_mutex_unlock
(
&
segment
->
lock
);
}
}
else
else
{
{
...
...
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