* Ensure garbage collector is called when disabling a video track (Closes:#935)

* Possible (not probable) fix for 934. Can't fix as building vlc on win32 is almost impossible

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 95ab305711881ae3fddcd763dfd538c4285a4b45..1ae3206daad5bdbb1c9fb8219794b1d344ea1116 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -89,7 +89,7 @@ void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y,
         return NULL;
     }
     p_vout = p_nvout;
-    setMinimumSize( 1,1 );
+    setMinimumSize( 0, 0 );
     return (void*)winId();
 }
 

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 22eb6297b698108e20203deb7b05e77359c92ade..275daab62e78abfc3b33ca4c2f50dde9f50fa457 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1303,6 +1303,14 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
                     }
                 }
             }
+            {
+                playlist_t * p_playlist = pl_Yield( p_sys->p_input );
+                PL_LOCK;
+                p_playlist->gc_date = mdate();
+                vlc_cond_signal( &p_playlist->object_wait );
+                PL_UNLOCK;
+                pl_Release( p_playlist );
+            }
             return VLC_SUCCESS;
 
         case ES_OUT_SET_PCR: