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
d4489a37
Commit
d4489a37
authored
Mar 21, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder: fix data race in sout
parent
d4dce40a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
src/input/decoder.c
src/input/decoder.c
+4
-1
No files found.
src/input/decoder.c
View file @
d4489a37
...
...
@@ -62,6 +62,7 @@ static void *DecoderThread( void * );
static
void
DecoderProcess
(
decoder_t
*
,
block_t
*
);
static
void
DecoderFlush
(
decoder_t
*
);
static
void
DecoderSignalWait
(
decoder_t
*
);
static
void
DecoderUpdateFormatLocked
(
decoder_t
*
);
static
void
DecoderUnsupportedCodec
(
decoder_t
*
,
vlc_fourcc_t
);
...
...
@@ -1498,9 +1499,11 @@ static void DecoderProcessSout( decoder_t *p_dec, block_t *p_block )
{
if
(
p_owner
->
p_sout_input
==
NULL
)
{
assert
(
!
p_owner
->
b_fmt_description
);
// no need for owner lock
vlc_mutex_lock
(
&
p_owner
->
lock
);
es_format_Clean
(
&
p_owner
->
fmt
);
es_format_Copy
(
&
p_owner
->
fmt
,
&
p_dec
->
fmt_out
);
DecoderUpdateFormatLocked
(
p_dec
);
vlc_mutex_unlock
(
&
p_owner
->
lock
);
p_owner
->
fmt
.
i_group
=
p_dec
->
fmt_in
.
i_group
;
p_owner
->
fmt
.
i_id
=
p_dec
->
fmt_in
.
i_id
;
...
...
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