Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
4832631e
Commit
4832631e
authored
Oct 08, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a potential deadlock.
parent
e5ed591a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
src/input/decoder.c
src/input/decoder.c
+2
-2
src/input/es_out.c
src/input/es_out.c
+1
-1
No files found.
src/input/decoder.c
View file @
4832631e
...
...
@@ -394,8 +394,8 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *p_block )
bool
input_DecoderIsEmpty
(
decoder_t
*
p_dec
)
{
/* FIXME it is buggy if the decoder is buffering FIXME
* -> "deadlock" */
assert
(
!
p_dec
->
p_owner
->
b_buffering
);
if
(
p_dec
->
p_owner
->
b_own_thread
&&
block_FifoCount
(
p_dec
->
p_owner
->
p_fifo
)
>
0
)
{
...
...
src/input/es_out.c
View file @
4832631e
...
...
@@ -1737,7 +1737,7 @@ static void EsOutDel( es_out_t *out, es_out_id_t *es )
/* We don't try to reselect */
if
(
es
->
p_dec
)
{
while
(
!
out
->
p_sys
->
p_input
->
b_die
&&
es
->
p_dec
)
while
(
!
p_sys
->
p_input
->
b_die
&&
!
p_sys
->
b_buffering
&&
es
->
p_dec
)
{
if
(
input_DecoderIsEmpty
(
es
->
p_dec
)
&&
(
!
es
->
p_dec_record
||
input_DecoderIsEmpty
(
es
->
p_dec_record
)
))
...
...
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