Mercurial > mplayer.hg

changeset 29490:5b8f21404b19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix incompatible pointer types warning, also seems to fix mis-compilation with gcc-4.4.1
author reimar
date Mon, 17 Aug 2009 08:02:37 +0000
parents 228b323e90a7
children 99eda963d27a
files libmpdemux/demux_mkv.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mkv.c	Mon Aug 17 07:30:24 2009 +0000
+++ b/libmpdemux/demux_mkv.c	Mon Aug 17 08:02:37 2009 +0000
@@ -235,7 +235,7 @@
     if (mkv_d->cluster_positions[i] == position)
       return;
 
-  grow_array(&mkv_d->cluster_positions, mkv_d->num_cluster_pos,
+  grow_array((void **)&mkv_d->cluster_positions, mkv_d->num_cluster_pos,
              sizeof(uint64_t));
   mkv_d->cluster_positions[mkv_d->num_cluster_pos++] = position;
 }
@@ -1079,7 +1079,7 @@
       if (time != EBML_UINT_INVALID && track != EBML_UINT_INVALID
           && pos != EBML_UINT_INVALID)
         {
-          grow_array(&mkv_d->indexes, mkv_d->num_indexes, sizeof(mkv_index_t));
+          grow_array((void **)&mkv_d->indexes, mkv_d->num_indexes, sizeof(mkv_index_t));
           mkv_d->indexes[mkv_d->num_indexes].tnum = track;
           mkv_d->indexes[mkv_d->num_indexes].timecode = time;
           mkv_d->indexes[mkv_d->num_indexes].filepos =mkv_d->segment_start+pos;