]> git.sesse.net Git - vlc/commitdiff
Revert "sout: Don't wait until all the es has atleast minimum amount of blocks in...
authorIlkka Ollakka <ileoo@videolan.org>
Sat, 29 Nov 2014 10:23:28 +0000 (12:23 +0200)
committerIlkka Ollakka <ileoo@videolan.org>
Sun, 30 Nov 2014 13:38:06 +0000 (15:38 +0200)
This reverts commit 57b356e2e2f646f7907a1518dbe605fc9899bc02.

src/stream_output/stream_output.c

index 4b4c89e0437a12e26e58cd34b61580a83be75d97..36c9157167b7cd632340e563b6b501bdccb1f540 100644 (file)
@@ -559,7 +559,14 @@ int sout_MuxGetStream( sout_mux_t *p_mux, unsigned i_blocks, mtime_t *pi_dts )
         block_t *p_data;
 
         if( block_FifoCount( p_input->p_fifo ) < i_blocks )
+        {
+            if( p_input->p_fmt->i_cat != SPU_ES )
+            {
+                return -1;
+            }
+            /* FIXME: SPU muxing */
             continue;
+        }
 
         p_data = block_FifoShow( p_input->p_fifo );
         if( i_stream < 0 || p_data->i_dts < i_dts )