Changeset 11edc20cf6bbd6fba977f69a5c4d76576dc7e5d4

Timestamp:

20/07/07 21:45:21 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1184960721 +0000

git-parent:

[f7e4f2966af46e183f179121fe55bc77ac8f2b1c]

git-author:

Laurent Aimar <fenrir@videolan.org> 1184960721 +0000

Message:

Fixed a bunch of warning because of stream_Peek change.

Files:

• modules/demux/asf/asf.c (modified) (3 diffs)
• modules/demux/asf/libasf.c (modified) (18 diffs)
• modules/demux/asf/libasf.h (modified) (1 diff)
• modules/demux/mp4/libmp4.c (modified) (3 diffs)

modules/demux/asf/asf.c

@@ -109 +109 @@
-    demux_sys_t *p_sys;
-    guid_t      guid;
-
+const 
-
-    /* A little test to see if it could be a asf stream */
@@ -142 +142 @@
-    for( ;; )
-    {
-
+const 
-        mtime_t i_length;
-        mtime_t i_time_begin = GetMoviePTS( p_sys );
@@ -356 +356 @@
-    demux_sys_t *p_sys = p_demux->p_sys;
-    int         i_data_packet_min = p_sys->p_fp->i_min_data_packet_size;
-uint8_t    
+const uint8_t
-    int         i_skip;
-

modules/demux/asf/libasf.c

@@ -51 +51 @@
- * GUID functions
- ****************************************************************************/
-
+const 
-{
-    p_guid->v1 = GetDWLE( p_data );
@@ -77 +77 @@
-{
-    asf_object_common_t *p_common = (asf_object_common_t*)p_obj;
-uint8_t            
+const uint8_t
-
-    if( stream_Peek( s, &p_peek, 24 ) < 24 )
@@ -141 +141 @@
-    asf_object_t        *p_subobj;
-    int                 i_peek;
-uint8_t      
+const uint8_t
-
-    if( ( i_peek = stream_Peek( s, &p_peek, 30 ) ) < 30 )
@@ -187 +187 @@
-    asf_object_data_t *p_data = (asf_object_data_t*)p_obj;
-    int               i_peek;
-uint8_t      
+const uint8_t
-
-    if( ( i_peek = stream_Peek( s, &p_peek, 50 ) ) < 50 )
@@ -212 +212 @@
-{
-    asf_object_index_t *p_index = (asf_object_index_t*)p_obj;
-uint8_t      
-
+const uint8_t
+ 
-
-    if( stream_Peek( s, &p_peek, p_index->i_object_size ) <
@@ -266 +266 @@
-{
-    asf_object_file_properties_t *p_fp = (asf_object_file_properties_t*)p_obj;
-
-uint8_t 
+     
+const uint8_t
-
-    if( ( i_peek = stream_Peek( s, &p_peek,  104) ) < 104 )
@@ -323 +323 @@
-
-    int i_peek, i_entries, i;
-
+const 
-#ifdef ASF_DEBUG
-    unsigned int j;
@@ -445 +445 @@
-        (asf_object_header_extension_t *)p_obj;
-    int     i_peek;
-
+const 
-
-    if( ( i_peek = stream_Peek( s, &p_peek, p_he->i_object_size ) ) <  46)
@@ -509 +509 @@
-    asf_object_stream_properties_t *p_sp =
-                    (asf_object_stream_properties_t*)p_obj;
-
-
+     
+const 
-
-    if( ( i_peek = stream_Peek( s, &p_peek,  p_sp->i_object_size ) ) < 78 )
@@ -602 +602 @@
-    asf_object_codec_list_t *p_cl = (asf_object_codec_list_t*)p_obj;
-    int     i_peek;
-
+const 
-
-    unsigned int i_codec;
@@ -711 +711 @@
-    asf_object_content_description_t *p_cd =
-        (asf_object_content_description_t *)p_obj;
-
+const 
-    int i_peek, i_title, i_artist, i_copyright, i_description, i_rating;
-    vlc_iconv_t cd = (vlc_iconv_t)-1;
@@ -785 +785 @@
-    asf_object_language_list_t *p_ll =
-        (asf_object_language_list_t*)p_obj;
-
+const 
-    int i_peek;
-    int i;
@@ -844 +844 @@
-    asf_object_stream_bitrate_properties_t *p_sb =
-        (asf_object_stream_bitrate_properties_t *)p_obj;
-
+const 
-    int i_peek;
-    int i;
@@ -883 +883 @@
-    asf_object_extended_stream_properties_t *p_esp =
-        (asf_object_extended_stream_properties_t*)p_obj;
-
+const 
-    int i_peek, i;
-
@@ -1008 +1008 @@
-    asf_object_advanced_mutual_exclusion_t *p_ae =
-        (asf_object_advanced_mutual_exclusion_t *)p_obj;
-
+const 
-    int i_peek;
-    int i;
@@ -1050 +1050 @@
-    asf_object_stream_prioritization_t *p_sp =
-        (asf_object_stream_prioritization_t *)p_obj;
-
+const 
-    int i_peek;
-    int i;
@@ -1095 +1095 @@
-    asf_object_extended_content_description_t *p_ec =
-        (asf_object_extended_content_description_t *)p_obj;
-
+const 
-    int i_peek;
-    int i;
@@ -1205 +1205 @@
-    asf_object_XXX_t *p_XX =
-        (asf_object_XXX_t *)p_obj;
-
+
+
-    int i_peek;
-

modules/demux/asf/libasf.h

@@ -450 +450 @@
-
-
-
+const 
-int  ASF_CmpGUID( const guid_t *p_guid1, const guid_t *p_guid2 );
-

modules/demux/mp4/libmp4.c

@@ -113 +113 @@
-*/
-
-
+const 
-{
-    return( ( p[0] <<16 ) + ( p[1] <<8 ) + p[2] );
-}
-
-
+const 
-{
-    memcpy( p_uuid, p_buff, 16 );
@@ -166 +166 @@
-{
-    int      i_read;
-
+const 
-
-    if( ( ( i_read = stream_Peek( p_stream, &p_peek, 32 ) ) < 8 ) )
@@ -316 +316 @@
-        p_box->i_type == FOURCC_free )
-    {
-
+const 
-        int     i_read;
-        vlc_fourcc_t i_fcc;