Commit 2227a864 authored by JP Dinger's avatar JP Dinger

Obligatory win32 compile fixes.

parent 59b025e3
......@@ -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 );
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_access.h>
#include <vlc_memory.h>
#include <errno.h>
#include <assert.h>
......
......@@ -71,6 +71,8 @@
# include "config.h"
#endif
#include <assert.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
......
......@@ -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 );
}
......
......@@ -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;
......
......@@ -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 );
}
......
......@@ -29,6 +29,8 @@
# include "config.h"
#endif
#include <assert.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_demux.h>
......
......@@ -31,6 +31,8 @@
# include "config.h"
#endif
#include <assert.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
......
......@@ -38,6 +38,8 @@
# include "config.h"
#endif
#include <assert.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment