diff --git a/include/config.h b/include/config.h
index e14fe45afb..e66a769956 100644
--- a/include/config.h
+++ b/include/config.h
@@ -281,7 +281,7 @@
 #define VPAR_IDLE_SLEEP                 100000
 
 /* Time to sleep when waiting for a buffer (from vout or the video fifo). */
-#define VPAR_OUTMEM_SLEEP               50000
+#define VPAR_OUTMEM_SLEEP               10000
 
 /* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember
  * that raising this level dramatically lengthens the compilation time. */
diff --git a/src/input/input.c b/src/input/input.c
index effc49daed..8e872677df 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -412,6 +412,9 @@ static void EndThread( input_thread_t * p_input )
         case AC3_AUDIO_ES:
             ac3dec_DestroyThread( (ac3dec_thread_t *)(p_input->pp_selected_es[i_es_loop]->p_dec) );
             break;
+        case 0:
+            /* Special streams for the PSI decoder, PID 0 and 1 */
+            break;
 #ifdef DEBUG
         default:
             intf_DbgMsg("error: unknown decoder type %d\n", p_input->pp_selected_es[i_es_loop]->i_type );
diff --git a/src/input/input_ctrl.c b/src/input/input_ctrl.c
index 3f3ac483bd..4a9b46d835 100644
--- a/src/input/input_ctrl.c
+++ b/src/input/input_ctrl.c
@@ -127,7 +127,6 @@ int input_AddPgrmElem( input_thread_t *p_input, int i_current_id )
                     case MPEG1_VIDEO_ES:
                     case MPEG2_VIDEO_ES:
                         /* Spawn video thread. */
-/* Les 2 pointeurs NULL ne doivent pas etre NULL sinon on segfault !!!! */
 #ifdef OLD_DECODER
                         if( ((vdec_thread_t*)(p_input->p_es[i_es_loop].p_dec) =
                             vdec_CreateThread( p_input )) == NULL )