X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Frawvid.c;h=21bdb4fde15cdf5bf6dd3652459b95a4dfa230f9;hb=552b5247eea6d1c0c93407c49ce64a39af751e43;hp=19e27b694fdbd5bd0a589e17f01a1997e5598345;hpb=2f541e74db27020b92c9603d1d4dfebcd05a300e;p=vlc

diff --git a/modules/demux/rawvid.c b/modules/demux/rawvid.c
index 19e27b694f..21bdb4fde1 100644
--- a/modules/demux/rawvid.c
+++ b/modules/demux/rawvid.c
@@ -30,7 +30,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_vout.h>                                     /* vout_InitFormat */
 
@@ -61,19 +62,19 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_shortname( "Raw Video" );
-    set_description( _("Raw video demuxer") );
-    set_capability( "demux2", 10 );
+    set_description( N_("Raw video demuxer") );
+    set_capability( "demux", 10 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_callbacks( Open, Close );
     add_shortcut( "rawvideo" );
-    add_float( "rawvid-fps", 0, 0, FPS_TEXT, FPS_LONGTEXT, VLC_FALSE );
+    add_float( "rawvid-fps", 0, 0, FPS_TEXT, FPS_LONGTEXT, false );
     add_integer( "rawvid-width", 0, 0, WIDTH_TEXT, WIDTH_LONGTEXT, 0 );
     add_integer( "rawvid-height", 0, 0, HEIGHT_TEXT, HEIGHT_LONGTEXT, 0 );
     add_string( "rawvid-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
-                VLC_TRUE );
+                true );
     add_string( "rawvid-aspect-ratio", NULL, NULL,
-                ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE );
+                ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true );
 vlc_module_end();
 
 /*****************************************************************************
@@ -89,7 +90,7 @@ struct demux_sys_t
 
     mtime_t i_pcr;
 
-    vlc_bool_t b_y4m;
+    bool b_y4m;
 };
 
 /*****************************************************************************
@@ -134,16 +135,16 @@ static int Open( vlc_object_t * p_this )
     unsigned int i_aspect = 0;
     struct preset_t *p_preset = NULL;
     const uint8_t *p_peek;
-    vlc_bool_t b_valid = VLC_FALSE;
-    vlc_bool_t b_y4m = VLC_FALSE;
+    bool b_valid = false;
+    bool b_y4m = false;
 
     if( stream_Peek( p_demux->s, &p_peek, 9 ) == 9 )
     {
         /* http://wiki.multimedia.cx/index.php?title=YUV4MPEG2 */
         if( !strncmp( (char *)p_peek, "YUV4MPEG2", 9 ) )
         {
-            b_valid = VLC_TRUE;
-            b_y4m = VLC_TRUE;
+            b_valid = true;
+            b_y4m = true;
         }
     }
 
@@ -154,7 +155,7 @@ static int Open( vlc_object_t * p_this )
         for( p_preset = p_presets; *p_preset->psz_ext; p_preset++ )
             if( !strcasecmp( psz_ext, p_preset->psz_ext ) )
             {
-                b_valid = VLC_TRUE;
+                b_valid = true;
                 break;
             }
     }
@@ -181,7 +182,8 @@ static int Open( vlc_object_t * p_this )
     {
         char *psz;
         char *buf;
-        int a, b = 1;
+        int a = 1;
+        int b = 1;
         psz = stream_ReadLine( p_demux->s );
 
         /* TODO: handle interlacing */
@@ -380,7 +382,7 @@ static int Demux( demux_t *p_demux )
     p_block->i_dts = p_block->i_pts = p_sys->i_pcr;
     es_out_Send( p_demux->out, p_sys->p_es_video, p_block );
 
-    p_sys->i_pcr += ( I64C(1000000) / p_sys->f_fps );
+    p_sys->i_pcr += ( INT64_C(1000000) / p_sys->f_fps );
 
     return 1;
 }
@@ -393,7 +395,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     demux_sys_t *p_sys  = p_demux->p_sys;
 
     /* XXX: DEMUX_SET_TIME is precise here */
-    return demux2_vaControlHelper( p_demux->s, 0, -1,
+    return demux_vaControlHelper( p_demux->s, 0, -1,
                                    p_sys->frame_size * p_sys->f_fps * 8,
                                    p_sys->frame_size, i_query, args );
 }