MP4: Parse transformation matrix

[vlc] / modules / demux / xiph.h

diff --git a/modules/demux/xiph.h b/modules/demux/xiph.h
index 24e4ca912e9a6d97d3da9d3548499614a2e3fda4..0ce5dc4b2be2f4c44d4968b368151c6f6854f552 100644 (file)
--- a/modules/demux/xiph.h
+++ b/modules/demux/xiph.h
@@ -48,7 +48,7 @@ static inline int xiph_SplitHeaders(unsigned packet_size[], void *packet[], unsi
         }
         size += packet_size[i];
     }
-    if (end - current < size)
+    if (end - current < (int)size)
         return VLC_EGENERIC;
     packet_size[count - 1] = end - current - size;
 
@@ -117,7 +117,7 @@ static inline int xiph_PackHeaders(int *extra_size, void **extra,
 }
 
 static inline int xiph_AppendHeaders(int *extra_size, void **extra,
-                                     unsigned size, void *data)
+                                     unsigned size, const void *data)
 {
     unsigned packet_size[XIPH_MAX_HEADER_COUNT];
     void *packet[XIPH_MAX_HEADER_COUNT];
@@ -134,7 +134,7 @@ static inline int xiph_AppendHeaders(int *extra_size, void **extra,
     free(*extra);
 
     packet_size[count] = size;
-    packet[count]      = data;
+    packet[count]      = (void*)data;
     if (xiph_PackHeaders(extra_size, extra, packet_size,
                          (const void **)packet, count + 1)) {
         *extra_size = 0;