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_ts.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_ts.c')
| -rw-r--r-- | src/demuxers/demux_ts.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 1b022d54a..3766c8af1 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.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_ts.c,v 1.11 2001/09/01 14:33:00 guenter Exp $ + * $Id: demux_ts.c,v 1.12 2001/09/04 16:19:27 guenter Exp $ * * Demultiplexer for MPEG2 Transport Streams. * @@ -944,6 +944,7 @@ static void demux_ts_stop(demux_plugin_t *this_gen) { demux_ts *this = (demux_ts *)this_gen; buf_element_t *buf; + void *p; printf ("demux_ts: stop...\n"); @@ -958,6 +959,7 @@ static void demux_ts_stop(demux_plugin_t *this_gen) this->status = DEMUX_FINISHED; pthread_cancel (this->thread); + pthread_join (this->thread, &p); this->fifoVideo->clear(this->fifoVideo); if(this->fifoAudio) |