[vlc-commits] demux: asf: fix signedness on stream mutex properties

Francois Cartegnie git at videolan.org
Sat Dec 7 20:04:22 CET 2013


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Dec  7 19:51:41 2013 +0100| [092aa902b195bb3e65cb30bd704bf507fa1c0739] | committer: Francois Cartegnie

demux: asf: fix signedness on stream mutex properties

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=092aa902b195bb3e65cb30bd704bf507fa1c0739
---

 modules/demux/asf/libasf.c |    4 ++--
 modules/demux/asf/libasf.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index dedb7c9..0520ae4 100644
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -1001,7 +1001,7 @@ static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s,
     asf_object_advanced_mutual_exclusion_t *p_ae = &p_obj->advanced_mutual_exclusion;
     const uint8_t *p_peek, *p_data;
     int i_peek;
-    int i;
+    uint16_t i;
 
     if( ( i_peek = stream_Peek( s, &p_peek, p_ae->i_object_size ) ) < 42 )
        return VLC_EGENERIC;
@@ -1018,7 +1018,7 @@ static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s,
     ASF_SKIP( 16 );
 
     p_ae->i_stream_number_count = ASF_READ2();
-    p_ae->pi_stream_number = calloc( p_ae->i_stream_number_count, sizeof(int) );
+    p_ae->pi_stream_number = calloc( p_ae->i_stream_number_count, sizeof(uint16_t) );
 
     for( i = 0; i < p_ae->i_stream_number_count; i++ )
     {
diff --git a/modules/demux/asf/libasf.h b/modules/demux/asf/libasf.h
index 59a2cb1..ccb1f94 100644
--- a/modules/demux/asf/libasf.h
+++ b/modules/demux/asf/libasf.h
@@ -302,8 +302,8 @@ typedef struct
     ASF_OBJECT_COMMON
 
     asf_exclusion_type_t exclusion_type;
-    int16_t i_stream_number_count;
-    int16_t *pi_stream_number;
+    uint16_t i_stream_number_count;
+    uint16_t *pi_stream_number;
 
 } asf_object_advanced_mutual_exclusion_t;
 



More information about the vlc-commits mailing list