libvlccore: Rename iso_lang.h to vlc_iso_lang.h because we use VLC_EXPORT there,...

[vlc] / src / input / es_out.c

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 500e2bccc5bb63f5d33e6970df8cc0aa9e4d2d05..bbafad2aa65c191f5a2ea609f64a2c3813610c68 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -41,7 +41,7 @@
 #include "input_internal.h"
 
 #include "vlc_playlist.h"
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 /* FIXME we should find a better way than including that */
 #include "../text/iso-639_def.h"
 
@@ -1362,7 +1362,7 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
     else
         i_delay = 0;
 
-    if( p_input->p_libvlc->b_stats )
+    if( libvlc_stats (p_input) )
     {
         vlc_mutex_lock( &p_input->p->counters.counters_lock );
         stats_UpdateInteger( p_input, p_input->p->counters.p_demux_read,
@@ -1403,7 +1403,8 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
         p_block->i_pts =
             input_ClockGetTS( p_input, &p_pgrm->clock, p_block->i_pts ) + i_delay;
     }
-    if ( es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
+    if ( p_block->i_rate == INPUT_RATE_DEFAULT &&
+         es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
     {
         mtime_t current_date = mdate();
         if( !p_block->i_pts
@@ -2090,7 +2091,7 @@ static void EsOutAddInfo( es_out_t *out, es_out_id_t *es )
                                fmt->video.i_frame_rate_base * 1000000,
                                1000000 );
            input_Control( p_input, INPUT_ADD_INFO, psz_cat,
-                          _("Frame rate"), I64Fd".%06u",
+                          _("Frame rate"), "%"PRId64".%06u",
                           div.quot, (unsigned int )div.rem );
        }
        break;