transcode/video: fit sar-calculation

[vlc] / modules / stream_out / autodel.c

diff --git a/modules/stream_out/autodel.c b/modules/stream_out/autodel.c
index b7cd3cba3c81020d63ada0055910d0362b4e8fd2..d3143efcd72cd26cad27ba1c29170d66c242f9f7 100644 (file)
--- a/modules/stream_out/autodel.c
+++ b/modules/stream_out/autodel.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
 
@@ -41,13 +42,13 @@ static void Close   ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-autodel-"
 
-vlc_module_begin();
-    set_shortname( _("Autodel"));
-    set_description( _("Automatically add/delete input streams"));
-    set_capability( "sout stream", 50 );
-    add_shortcut( "autodel" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( N_("Autodel"))
+    set_description( N_("Automatically add/delete input streams"))
+    set_capability( "sout stream", 50 )
+    add_shortcut( "autodel" )
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 
 /*****************************************************************************
@@ -62,7 +63,7 @@ struct sout_stream_id_t
     sout_stream_id_t *id;
     es_format_t fmt;
     mtime_t i_last;
-    vlc_bool_t b_error;
+    bool b_error;
 };
 
 struct sout_stream_sys_t
@@ -125,8 +126,8 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 
     p_es->fmt = *p_fmt;
     p_es->id = NULL;
-    p_es->i_last = 0;
-    p_es->b_error = VLC_FALSE;
+    p_es->i_last = VLC_TS_INVALID;
+    p_es->b_error = false;
     TAB_APPEND( p_sys->i_es_num, p_sys->pp_es, p_es );
 
     return p_es;
@@ -154,18 +155,18 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *p_es,
     int i;
 
     p_es->i_last = p_buffer->i_dts;
-    if ( p_es->id == NULL && p_es->b_error != VLC_TRUE )
+    if ( p_es->id == NULL && p_es->b_error != true )
     {
         p_es->id = p_sys->p_out->pf_add( p_sys->p_out, &p_es->fmt );
         if ( p_es->id == NULL )
         {
-            p_es->b_error = VLC_TRUE;
+            p_es->b_error = true;
             msg_Err( p_stream, "couldn't create chain for id %d",
                      p_es->fmt.i_id );
         }
     }
 
-    if ( p_es->b_error != VLC_TRUE )
+    if ( p_es->b_error != true )
         p_sys->p_out->pf_send( p_sys->p_out, p_es->id, p_buffer );
     else
         block_ChainRelease( p_buffer );