Merge from 1.1.

2 files changed, 35 insertions, 11 deletions

diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c
index 30cdadc7c..43390ede5 100644
--- a/src/xine-engine/broadcaster.c
+++ b/src/xine-engine/broadcaster.c
@@ -352,6 +352,17 @@ broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port)
 
 void _x_close_broadcaster(broadcaster_t *this)
 {
+  this->running = 0;
+  pthread_cancel(this->manager_thread);
+  pthread_join(this->manager_thread,NULL);
+  close(this->msock);
+  
+  if (this->stream->video_fifo)
+    this->stream->video_fifo->unregister_put_cb(this->stream->video_fifo, video_put_cb);
+
+  if(this->stream->audio_fifo)
+    this->stream->audio_fifo->unregister_put_cb(this->stream->audio_fifo, audio_put_cb);
+  
   xine_list_iterator_t ite;
   
   while ( (ite = xine_list_front(this->connections)) ) {
@@ -362,18 +373,9 @@ void _x_close_broadcaster(broadcaster_t *this)
     xine_list_remove (this->connections, ite);
   }
   xine_list_delete(this->connections);
-  
-  this->running = 0;  
-  close(this->msock);
-  pthread_mutex_lock( &this->lock );
-  pthread_cancel(this->manager_thread);
-  pthread_join(this->manager_thread,NULL);
-    
-  this->stream->video_fifo->unregister_put_cb(this->stream->video_fifo, video_put_cb);
 
-  if(this->stream->audio_fifo)
-    this->stream->audio_fifo->unregister_put_cb(this->stream->audio_fifo, audio_put_cb);
-  
+  pthread_mutex_destroy( &this->lock );
+
   free(this);
 }
 
diff --git a/src/xine-engine/post.c b/src/xine-engine/post.c
index 0dba50c82..50254378b 100644
--- a/src/xine-engine/post.c
+++ b/src/xine-engine/post.c
@@ -373,6 +373,9 @@ vo_frame_t *_x_post_intercept_video_frame(vo_frame_t *frame, post_video_port_t *
   /* make a copy and attach the original */
   xine_fast_memcpy(new_frame, frame, sizeof(vo_frame_t));
   new_frame->next = frame;
+
+  if (new_frame->stream)
+    _x_refcounter_inc(new_frame->stream->refcounter);
   
   /* modify the frame with the intercept functions */
   new_frame->port             = &port->new_port;
@@ -410,6 +413,9 @@ vo_frame_t *_x_post_restore_video_frame(vo_frame_t *frame, post_video_port_t *po
   /* propagate any changes */
   _x_post_frame_copy_down(frame, original);
   
+  if (frame->stream)
+    _x_refcounter_dec(frame->stream->refcounter);
+
   /* put the now free slot into the free frames list */
   pthread_mutex_lock(&port->free_frames_lock);
   frame->next = port->free_frame_slots;
@@ -421,6 +427,11 @@ vo_frame_t *_x_post_restore_video_frame(vo_frame_t *frame, post_video_port_t *po
 
 void _x_post_frame_copy_down(vo_frame_t *from, vo_frame_t *to) {
   /* propagate changes downwards (from decoders to video out) */
+  if (from->stream)
+    _x_refcounter_inc(from->stream->refcounter);
+  if (to->stream)
+    _x_refcounter_dec(to->stream->refcounter);
+
   to->pts                 = from->pts;
   to->bad_frame           = from->bad_frame;
   to->duration            = from->duration;
@@ -443,8 +454,14 @@ void _x_post_frame_copy_down(vo_frame_t *from, vo_frame_t *to) {
 
 void _x_post_frame_copy_up(vo_frame_t *to, vo_frame_t *from) {
   /* propagate changes upwards (from video out to decoders) */
+  if (from->stream)
+    _x_refcounter_inc(from->stream->refcounter);
+  if (to->stream)
+    _x_refcounter_dec(to->stream->refcounter);
+
   to->vpts     = from->vpts;
   to->duration = from->duration;
+  to->stream   = from->stream;
   
   if (to->extra_info != from->extra_info)
     _x_extra_info_merge(to->extra_info, from->extra_info);
@@ -452,6 +469,11 @@ void _x_post_frame_copy_up(vo_frame_t *to, vo_frame_t *from) {
 
 void _x_post_frame_u_turn(vo_frame_t *frame, xine_stream_t *stream) {
   /* frame's travel will end here => do the housekeeping */
+  if (stream)
+    _x_refcounter_inc(stream->refcounter);
+  if (frame->stream)
+    _x_refcounter_dec(frame->stream->refcounter);
+
   frame->stream = stream;
   if (stream) {
     _x_extra_info_merge(frame->extra_info, stream->video_decoder_extra_info);