]> git.sesse.net Git - vlc/blobdiff - modules/audio_output/alsa.c
Do not assert memory allocations
[vlc] / modules / audio_output / alsa.c
index 84e3fd5e7f94e2087bd7805e8731cd207b05c649..36b8c9a9904ce5f7e1598f76cffc57f98ef12134 100644 (file)
@@ -42,8 +42,6 @@
 #include <vlc_aout.h>
 #include <vlc_cpu.h>
 
-#include <vlc_memory.h>
-
 /* ALSA part
    Note: we use the new API which is available since 0.9.0beta10a. */
 #define ALSA_PCM_NEW_HW_PARAMS_API
@@ -1004,12 +1002,10 @@ static void GetDevicesForCard( module_config_t *p_item, int i_card )
             break;
         }
 
-        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 ] = psz_device;
         p_item->ppsz_list_text[ p_item->i_list ] = psz_descr;
         p_item->i_list++;