]> git.sesse.net Git - vlc/blobdiff - modules/video_output/msw/directx.c
Do not assert memory allocations
[vlc] / modules / video_output / msw / directx.c
index 10b401dbdf017baf1103d03fe86f2057258baf86..c2c7fc11b7e0a025d41fb4c08e4de720ad6393c7 100644 (file)
 # include "config.h"
 #endif
 
-#include <assert.h>
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_playlist.h>   /* needed for wallpaper */
-#include <vlc_memory.h>
 
 #include <ddraw.h>
 #include <commctrl.h>       /* ListView_(Get|Set)* */
@@ -1820,12 +1817,10 @@ BOOL WINAPI DirectXEnumCallback2( GUID* p_guid, LPTSTR psz_desc,
 
     module_config_t *p_item = (module_config_t *)p_context;
 
-    p_item->ppsz_list = realloc_or_free( p_item->ppsz_list,
+    p_item->ppsz_list = xrealloc( p_item->ppsz_list,
                           (p_item->i_list+2) * 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 = xrealloc( p_item->ppsz_list_text,
                           (p_item->i_list+2) * sizeof(char *) );
-    assert( p_item->ppsz_list_text );
 
     p_item->ppsz_list[p_item->i_list] = strdup( psz_drivername );
     p_item->ppsz_list_text[p_item->i_list] = NULL;