QT4: connect signal from inputmanager metaChanged to playlist-model so it updates...

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 9c2e271d44a061020fffd841daa73ad86297398f..adc4f6949055d8fd4b1993b69f75107c0c47f262 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -77,8 +77,6 @@ static void vout_unlink_picture( decoder_t *, picture_t * );
 static subpicture_t *spu_new_buffer( decoder_t * );
 static void spu_del_buffer( decoder_t *, subpicture_t * );
 
-static es_format_t null_es_format;
-
 struct decoder_owner_sys_t
 {
     int64_t         i_preroll_end;
@@ -305,8 +303,9 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
     }
 
     p_dec->p_owner->p_clock = p_clock;
+    assert( p_dec->fmt_out.i_cat != UNKNOWN_ES );
 
-    if( fmt->i_cat == AUDIO_ES )
+    if( p_dec->fmt_out.i_cat == AUDIO_ES )
         i_priority = VLC_THREAD_PRIORITY_AUDIO;
     else
         i_priority = VLC_THREAD_PRIORITY_VIDEO;
@@ -588,7 +587,7 @@ void input_DecoderFrameNext( decoder_t *p_dec, mtime_t *pi_duration )
     *pi_duration = 0;
 
     vlc_mutex_lock( &p_owner->lock );
-    if( p_dec->fmt_in.i_cat == VIDEO_ES )
+    if( p_dec->fmt_out.i_cat == VIDEO_ES )
     {
         if( p_owner->b_paused && p_owner->p_vout )
         {
@@ -694,6 +693,8 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
 {
     decoder_t *p_dec;
     decoder_owner_sys_t *p_owner;
+    es_format_t null_es_format;
+
     int i;
 
     p_dec = vlc_object_create( p_input, i_object_type );
@@ -1011,13 +1012,13 @@ static void DecoderOutputChangePause( decoder_t *p_dec, bool b_paused, mtime_t i
      * - for sout it is useless
      * - for subs, it is done by the vout
      */
-    if( p_dec->fmt_in.i_cat == AUDIO_ES )
+    if( p_dec->fmt_out.i_cat == AUDIO_ES )
     {
         if( p_owner->p_aout && p_owner->p_aout_input )
             aout_DecChangePause( p_owner->p_aout, p_owner->p_aout_input,
                                  b_paused, i_date );
     }
-    else if( p_dec->fmt_in.i_cat == VIDEO_ES )
+    else if( p_dec->fmt_out.i_cat == VIDEO_ES )
     {
         if( p_owner->p_vout )
             vout_ChangePause( p_owner->p_vout, b_paused, i_date );
@@ -1975,15 +1976,15 @@ static void DecoderProcess( decoder_t *p_dec, block_t *p_block )
             p_block->i_flags &= ~BLOCK_FLAG_CORE_PRIVATE_MASK;
         }
 
-        if( p_dec->fmt_in.i_cat == AUDIO_ES )
+        if( p_dec->fmt_out.i_cat == AUDIO_ES )
         {
             DecoderProcessAudio( p_dec, p_block, b_flush );
         }
-        else if( p_dec->fmt_in.i_cat == VIDEO_ES )
+        else if( p_dec->fmt_out.i_cat == VIDEO_ES )
         {
             DecoderProcessVideo( p_dec, p_block, b_flush );
         }
-        else if( p_dec->fmt_in.i_cat == SPU_ES )
+        else if( p_dec->fmt_out.i_cat == SPU_ES )
         {
             DecoderProcessSpu( p_dec, p_block, b_flush );
         }
@@ -2066,7 +2067,7 @@ static void DeleteDecoder( decoder_t * p_dec )
     }
 #endif
 
-    if( p_dec->fmt_in.i_cat == SPU_ES )
+    if( p_dec->fmt_out.i_cat == SPU_ES )
     {
         vout_thread_t *p_vout;