Obligatory win32 compile fixes.

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index bcdcda831e05d4a34d17b4a82e7cae11bf7b6830..710280c5dde62d9696a55360c013f9c36c84a184 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -1104,8 +1104,9 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
             dshow_stream.p_device_filter = p_device_filter;
             dshow_stream.p_capture_filter = p_capture_filter;
 
-            p_sys->pp_streams = realloc_or_free( p_sys->pp_streams,
-                sizeof(dshow_stream_t *) * (p_sys->i_streams + 1) );
+            p_sys->pp_streams = (dshow_stream_t **)realloc_or_free(
+                                                           p_sys->pp_streams,
+                          sizeof(dshow_stream_t *) * (p_sys->i_streams + 1) );
             assert( p_sys->pp_streams );
             p_sys->pp_streams[p_sys->i_streams] = new dshow_stream_t;
             *p_sys->pp_streams[p_sys->i_streams++] = dshow_stream;
@@ -1967,10 +1968,10 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name,
 
     if( !list_devices.size() ) return VLC_SUCCESS;
 
-    p_item->ppsz_list = realloc_or_free( p_item->ppsz_list,
+    p_item->ppsz_list = (char**)realloc_or_free( p_item->ppsz_list,
                           (list_devices.size()+3) * sizeof(char *) );
     assert( p_item->ppsz_list );
-    p_item->ppsz_list_text = realloc_or_free( p_item->ppsz_list_text,
+    p_item->ppsz_list_text = (char**)realloc_or_free( p_item->ppsz_list_text,
                           (list_devices.size()+3) * sizeof(char *) );
     assert( p_item->ppsz_list_text );
 

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 89a772aefc1eeba2e41798d339bac902ab522f3c..cf2ac5e1125d30a26a3131d6d3fea1c2c8b55c9e 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -31,6 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_access.h>
+#include <vlc_memory.h>
 
 #include <errno.h>
 #include <assert.h>

diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index 47ad7db1263cd19bbceed101bf467644e9a0fe8b..4fecfc3d889f79a423a70a568370a9763b672657 100644 (file)
--- a/modules/codec/dvbsub.c
+++ b/modules/codec/dvbsub.c
@@ -71,6 +71,8 @@
 # include "config.h"
 #endif
 
+#include <assert.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 13f0e3020b5ddd90c5d127a8ecea6c000a1ce263..449ecf60eae7512b4391bdcc51b3072d6efe7bf3 100644 (file)
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -367,7 +367,7 @@ static void ProcessHeader( decoder_t *p_dec )
         p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra;
         p_dec->fmt_out.p_extra = realloc_or_free( p_dec->fmt_out.p_extra,
                                                   p_dec->fmt_out.i_extra );
-        assert( p_dec->fmt_out.p_extra );
+        /*assert( p_dec->fmt_out.p_extra ); assert undefined here? */
         memcpy( p_dec->fmt_out.p_extra,
                 p_dec->fmt_in.p_extra, p_dec->fmt_out.i_extra );
     }

diff --git a/modules/demux/mkv/chapters.cpp b/modules/demux/mkv/chapters.cpp
index 2772f7060c84a52c2b6001760db17577540eee5d..1272eb1b639d031dd86fc68531854cd40e9e0a17 100644 (file)
--- a/modules/demux/mkv/chapters.cpp
+++ b/modules/demux/mkv/chapters.cpp
@@ -65,7 +65,7 @@ int chapter_item_c::PublishChapters( input_title_t & title, int & i_user_chapter
 
         // A start time of '0' is ok. A missing ChapterTime element is ok, too, because '0' is its default value.
         title.i_seekpoint++;
-        title.seekpoint = realloc_or_free( title.seekpoint,
+        title.seekpoint = (seekpoint_t**)realloc_or_free( title.seekpoint,
                                  title.i_seekpoint * sizeof( seekpoint_t* ) );
         assert( title.seekpoint );
         title.seekpoint[title.i_seekpoint-1] = sk;

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 67124c7f114a2148b5c91da03e56ef7b05fe537c..7c6f2b6b1cab36008e168de3ee205bce2bb1314e 100644 (file)
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -182,7 +182,7 @@ void matroska_segment_c::LoadCues( KaxCues *cues )
             if( i_index >= i_index_max )
             {
                 i_index_max += 1024;
-                p_indexes = realloc_or_free( p_indexes,
+                p_indexes = (mkv_index_t*)realloc_or_free( p_indexes,
                                         sizeof( mkv_index_t ) * i_index_max );
                 assert( p_indexes );
             }
@@ -377,7 +377,7 @@ void matroska_segment_c::IndexAppendCluster( KaxCluster *cluster )
     if( i_index >= i_index_max )
     {
         i_index_max += 1024;
-        p_indexes = realloc_or_free( p_indexes,
+        p_indexes = (mkv_index_t*)realloc_or_free( p_indexes,
                                         sizeof( mkv_index_t ) * i_index_max );
         assert( p_indexes );
     }

diff --git a/modules/demux/nuv.c b/modules/demux/nuv.c
index 31abc9765dabec184f94fa52bee09f3d3371c01e..0230ec20c371b17e7c3e38ed15106287783691d0 100644 (file)
--- a/modules/demux/nuv.c
+++ b/modules/demux/nuv.c
@@ -29,6 +29,8 @@
 # include "config.h"
 #endif
 
+#include <assert.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index 69e6978ba1d047c22c722777212e9251a3d199ea..f791ddd7d622887d612d0ae8e85e5a67762c7ba8 100644 (file)
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -31,6 +31,8 @@
 # include "config.h"
 #endif
 
+#include <assert.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>

diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index c2a1fa552c8f5aef7a76af3ba83cd26109277674..10b401dbdf017baf1103d03fe86f2057258baf86 100644 (file)
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -38,6 +38,8 @@
 # include "config.h"
 #endif
 
+#include <assert.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>