From 681de9b185ef4780618bb86c3a7e5ca3e167df82 Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Mon, 10 Jun 2002 13:41:55 +0000 Subject: better fix for logo race condition CVS patchset: 2056 CVS date: 2002/06/10 13:41:55 --- src/xine-engine/video_decoder.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/xine-engine/video_decoder.c') diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index 10c2b5022..54d1cf75a 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.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: video_decoder.c,v 1.88 2002/06/09 10:59:33 miguelfreitas Exp $ + * $Id: video_decoder.c,v 1.89 2002/06/10 13:41:55 miguelfreitas Exp $ * */ @@ -158,12 +158,16 @@ void *video_decoder_loop (void *this_gen) { pthread_mutex_lock (&this->finished_lock); this->spu_finished = 1; - if (!this->video_finished && (buf->decoder_flags & BUF_FLAG_END_STREAM )) { - + if (!this->video_finished ) { this->video_finished = 1; - + if (this->audio_finished) { - xine_notify_stream_finished (this); + if( this->playing_logo ) + buf->decoder_flags = 0; + this->playing_logo = 0; + + if( buf->decoder_flags & BUF_FLAG_END_STREAM ) + xine_notify_stream_finished (this); } } -- cgit v1.2.3