Use vlc_memset/vlc_memcpy

[vlc] / modules / audio_mixer / trivial.c

diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c
index 629b08663f03e067fce4635080c142520c180bc7..69d72c2393648dc9027b0f16b519dbe4985e01d2 100644 (file)
--- a/modules/audio_mixer/trivial.c
+++ b/modules/audio_mixer/trivial.c
@@ -29,6 +29,7 @@
 # include "config.h"
 #endif
 
+#include <stddef.h>
 #include <vlc/vlc.h>
 #include <vlc_aout.h>
 
@@ -78,8 +79,8 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
     int i_nb_channels = aout_FormatNbChannels( &p_aout->mixer.mixer );
     int i_nb_bytes = p_buffer->i_nb_samples * sizeof(int32_t)
                       * i_nb_channels;
-    byte_t * p_in;
-    byte_t * p_out;
+    uint8_t * p_in;
+    uint8_t * p_out;
 
     while ( p_input->b_error )
     {
@@ -102,8 +103,7 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
         {
             aout_buffer_t * p_old_buffer;
 
-            if ( i_available_bytes > 0 )
-                p_aout->p_libvlc->pf_memcpy( p_out, p_in, i_available_bytes );
+            vlc_memcpy( p_out, p_in, i_available_bytes );
             i_nb_bytes -= i_available_bytes;
             p_out += i_available_bytes;
 
@@ -119,8 +119,7 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
         }
         else
         {
-            if ( i_nb_bytes > 0 )
-                p_aout->p_libvlc->pf_memcpy( p_out, p_in, i_nb_bytes );
+            vlc_memcpy( p_out, p_in, i_nb_bytes );
             p_input->p_first_byte_to_mix = p_in + i_nb_bytes;
             break;
         }