diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-09-04 16:19:27 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-09-04 16:19:27 +0000 |
| commit | cb0ba2db97ee509f91e39dd0cde571c3322f13ea (patch) | |
| tree | bf1ddbde11ec3f3cf98634dc114951e3faa16b8a /src/demuxers/demux_mpeg_block.c | |
| parent | fa9f180ebb7c9ac3a9f8cbacb47267d3431efec1 (diff) | |
| download | xine-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_mpeg_block.c')
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index ab11c36d4..82e58da4f 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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_mpeg_block.c,v 1.37 2001/09/03 17:47:41 guenter Exp $ + * $Id: demux_mpeg_block.c,v 1.38 2001/09/04 16:19:27 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -580,6 +580,7 @@ static void demux_mpeg_block_stop (demux_plugin_t *this_gen) { demux_mpeg_block_t *this = (demux_mpeg_block_t *) this_gen; buf_element_t *buf; + void *p; if (this->status != DEMUX_OK) { printf ("demux_mpeg_block: stop...ignored\n"); @@ -590,6 +591,7 @@ static void demux_mpeg_block_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) |