Don't re-invent uint8_t - remove byte_t

[vlc] / modules / demux / flac.c

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index b2202c544e25d7fdb67843c5539d11fb0a5005f3..3d9bf2456ad206737c9b38607b4082e0be5024f3 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -45,7 +45,7 @@ static void Close ( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("FLAC demuxer") );
-    set_capability( "demux2", 155 );
+    set_capability( "demux", 155 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_callbacks( Open, Close );
@@ -99,7 +99,7 @@ static int Open( vlc_object_t * p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
-    const byte_t *p_peek;
+    const uint8_t *p_peek;
     uint8_t     *p_streaminfo;
     int         i_streaminfo;
 
@@ -401,7 +401,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         return VLC_SUCCESS;
     }
 
-    return demux2_vaControlHelper( p_demux->s, p_sys->i_data_pos, -1,
+    return demux_vaControlHelper( p_demux->s, p_sys->i_data_pos, -1,
                                    8*0, 1, i_query, args );
 }