diff options
| author | Juergen Keil <jkeil@users.sourceforge.net> | 2002-03-11 19:49:07 +0000 |
|---|---|---|
| committer | Juergen Keil <jkeil@users.sourceforge.net> | 2002-03-11 19:49:07 +0000 |
| commit | 619e78fc07c1b8622eb4f8f43d979fab476c24a2 (patch) | |
| tree | 4eca59fb253efbc9244c1486b0ff9a8dc4b8c0a0 | |
| parent | face806c1ee187c1efbaa88313c955b9947948db (diff) | |
| download | xine-lib-619e78fc07c1b8622eb4f8f43d979fab476c24a2.tar.gz xine-lib-619e78fc07c1b8622eb4f8f43d979fab476c24a2.tar.bz2 | |
Check both BUF_FLAG_END_STREAM and BUF_FLAG_END_USER flag to detect end of
stream. Without it, xine-engine stays in XINE_PLAY mode at the end of stream
and a subsequent xine_play() is a no-op.
CVS patchset: 1555
CVS date: 2002/03/11 19:49:07
| -rw-r--r-- | src/xine-engine/audio_decoder.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/video_decoder.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index 2e4c9f5c8..0aea0e278 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_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: audio_decoder.c,v 1.64 2002/03/11 12:31:26 guenter Exp $ + * $Id: audio_decoder.c,v 1.65 2002/03/11 19:49:07 jkeil Exp $ * * * functions that implement audio decoding @@ -98,7 +98,7 @@ void *audio_decoder_loop (void *this_gen) { pthread_mutex_lock (&this->finished_lock); - if (!this->audio_finished && (buf->decoder_flags==BUF_FLAG_END_USER)) { + if (!this->audio_finished && (buf->decoder_flags & (BUF_FLAG_END_STREAM | BUF_FLAG_END_USER))) { this->audio_finished = 1; if (this->video_finished) { diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index cd8e14142..66421fecb 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.76 2002/03/11 12:31:26 guenter Exp $ + * $Id: video_decoder.c,v 1.77 2002/03/11 19:49:07 jkeil Exp $ * */ @@ -155,7 +155,7 @@ 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 && (buf->decoder_flags & (BUF_FLAG_END_STREAM | BUF_FLAG_END_USER))) { this->video_finished = 1; |