Fix compiler warning about asprintf return value.

[vlc] / modules / demux / vc1.c

diff --git a/modules/demux/vc1.c b/modules/demux/vc1.c
index d5e1a3d2ed6b1984e2e4741d244d416dd563c07c..f6c7625067a37e692f8c2634a64e9c5bc8198114 100644 (file)
--- a/modules/demux/vc1.c
+++ b/modules/demux/vc1.c
@@ -25,7 +25,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include "vlc_codec.h"
 
@@ -42,9 +47,9 @@ vlc_module_begin();
     set_shortname( "VC-1");
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_description( _("VC1 video demuxer" ) );
-    set_capability( "demux2", 0 );
-    add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_TRUE );
+    set_description( N_("VC1 video demuxer" ) );
+    set_capability( "demux", 0 );
+    add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true );
     set_callbacks( Open, Close );
     add_shortcut( "vc1" );
 vlc_module_end();
@@ -73,7 +78,7 @@ static int Open( vlc_object_t * p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
-    uint8_t     *p_peek;
+    const uint8_t *p_peek;
     vlc_value_t val;
 
     if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 ) return VLC_EGENERIC;
@@ -148,7 +153,7 @@ static int Demux( demux_t *p_demux)
 
             if( p_sys->p_es == NULL )
             {
-                p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
+                p_sys->p_packetizer->fmt_out.b_packetized = true;
                 p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
             }
 
@@ -162,13 +167,13 @@ static int Demux( demux_t *p_demux)
 
             if( p_sys->p_packetizer->fmt_out.video.i_frame_rate > 0 &&
                 p_sys->p_packetizer->fmt_out.video.i_frame_rate_base > 0 )
-                p_sys->i_dts += I64C(1000000) *
+                p_sys->i_dts += INT64_C(1000000) *
                     p_sys->p_packetizer->fmt_out.video.i_frame_rate_base /
                     p_sys->p_packetizer->fmt_out.video.i_frame_rate;
             else if( p_sys->f_fps > 0.001 )
                 p_sys->i_dts += (int64_t)((double)1000000.0 / p_sys->f_fps);
             else
-                p_sys->i_dts += I64C(1000000) / 25;
+                p_sys->i_dts += INT64_C(1000000) / 25;
         }
     }
     return 1;
@@ -184,7 +189,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     if( i_query == DEMUX_SET_TIME )
         return VLC_EGENERIC;
     else
-        return demux2_vaControlHelper( p_demux->s,
+        return demux_vaControlHelper( p_demux->s,
                                        0, -1,
                                        0, 1, i_query, args );
 }