summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_pes.c
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2001-09-04 16:19:27 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2001-09-04 16:19:27 +0000
commitcb0ba2db97ee509f91e39dd0cde571c3322f13ea (patch)
treebf1ddbde11ec3f3cf98634dc114951e3faa16b8a /src/demuxers/demux_pes.c
parentfa9f180ebb7c9ac3a9f8cbacb47267d3431efec1 (diff)
downloadxine-lib-cb0ba2db97ee509f91e39dd0cde571c3322f13ea.tar.gz
xine-lib-cb0ba2db97ee509f91e39dd0cde571c3322f13ea.tar.bz2
race condition / stability fixes provided by Miguel Freitas <miguel@cetuc.puc-rio.br> - great stuff\! :-)
CVS patchset: 562 CVS date: 2001/09/04 16:19:27
Diffstat (limited to 'src/demuxers/demux_pes.c')
-rw-r--r--src/demuxers/demux_pes.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c
index 4f746eb0c..0c5b33fa9 100644
--- a/src/demuxers/demux_pes.c
+++ b/src/demuxers/demux_pes.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_pes.c,v 1.6 2001/09/01 14:33:00 guenter Exp $
+ * $Id: demux_pes.c,v 1.7 2001/09/04 16:19:27 guenter Exp $
*
* demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
* reads streams of variable blocksizes
@@ -354,6 +354,7 @@ static void demux_pes_stop (demux_plugin_t *this_gen) {
demux_pes_t *this = (demux_pes_t *) this_gen;
buf_element_t *buf;
+ void *p;
printf ("demux_pes: stop...\n");
@@ -370,6 +371,7 @@ static void demux_pes_stop (demux_plugin_t *this_gen) {
this->status = DEMUX_FINISHED;
pthread_cancel (this->thread);
+ pthread_join (this->thread, &p);
this->video_fifo->clear(this->video_fifo);
if(this->audio_fifo)