xine engine cleanups and new callbacks for seamless branching

CVS patchset: 192
CVS date: 2001/06/16 18:03:21

1 files changed, 10 insertions, 6 deletions

diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index adb5876e5..53780cf19 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.23 2001/06/16 14:34:49 guenter Exp $
+ * $Id: video_decoder.c,v 1.24 2001/06/16 18:03:22 guenter Exp $
  *
  */
 
@@ -107,12 +107,16 @@ void *video_decoder_loop (void *this_gen) {
       }
 
       pthread_mutex_lock (&this->xine_lock);
-
-      this->video_finished = 1;
       
-      if (this->audio_finished) {
-	pthread_mutex_unlock (&this->xine_lock);
-	xine_notify_stream_finished (this);
+      if (!this->video_finished && (buf->decoder_info[0]==0)) {
+
+	this->video_finished = 1;
+	
+	if (this->audio_finished) {
+	  pthread_mutex_unlock (&this->xine_lock);
+	  xine_notify_stream_finished (this);
+	} else
+	  pthread_mutex_unlock (&this->xine_lock);
       } else
 	pthread_mutex_unlock (&this->xine_lock);