Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
ebfaed9b
Commit
ebfaed9b
authored
Jan 12, 2001
by
Sam Hocevar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
. destroy fifo mutex and cond variables _after_ they are used for
the last time. henri, that'll be one binouze.
parent
c393ff60
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
src/input/input_dec.c
src/input/input_dec.c
+1
-5
src/input/input_programs.c
src/input/input_programs.c
+6
-1
No files found.
src/input/input_dec.c
View file @
ebfaed9b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* input_dec.c: Functions for the management of decoders
* input_dec.c: Functions for the management of decoders
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_dec.c,v 1.
4 2001/01/10 19:22:11 massiot
Exp $
* $Id: input_dec.c,v 1.
5 2001/01/12 14:49:55 sam
Exp $
*
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
*
...
@@ -61,10 +61,6 @@ void input_EndDecoder( input_thread_t * p_input, es_descriptor_t * p_es )
...
@@ -61,10 +61,6 @@ void input_EndDecoder( input_thread_t * p_input, es_descriptor_t * p_es )
input_DecodePES
(
p_es
->
p_decoder_fifo
,
p_es
->
p_pes
);
input_DecodePES
(
p_es
->
p_decoder_fifo
,
p_es
->
p_pes
);
}
}
/* Destroy the lock and cond */
vlc_cond_destroy
(
&
p_es
->
p_decoder_fifo
->
data_wait
);
vlc_mutex_destroy
(
&
p_es
->
p_decoder_fifo
->
data_lock
);
/* Waiting for the thread to exit */
/* Waiting for the thread to exit */
vlc_thread_join
(
p_es
->
thread_id
);
vlc_thread_join
(
p_es
->
thread_id
);
...
...
src/input/input_programs.c
View file @
ebfaed9b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_programs.c,v 1.2
3 2001/01/10 19:22:11 massiot
Exp $
* $Id: input_programs.c,v 1.2
4 2001/01/12 14:49:55 sam
Exp $
*
*
* Authors:
* Authors:
*
*
...
@@ -342,6 +342,11 @@ void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es )
...
@@ -342,6 +342,11 @@ void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es )
if
(
p_es
->
p_decoder_fifo
!=
NULL
)
if
(
p_es
->
p_decoder_fifo
!=
NULL
)
{
{
input_EndDecoder
(
p_input
,
p_es
);
input_EndDecoder
(
p_input
,
p_es
);
/* Destroy the lock and cond */
vlc_cond_destroy
(
&
p_es
->
p_decoder_fifo
->
data_wait
);
vlc_mutex_destroy
(
&
p_es
->
p_decoder_fifo
->
data_lock
);
free
(
p_es
->
p_decoder_fifo
);
free
(
p_es
->
p_decoder_fifo
);
}
}
...
...
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