Removes trailing spaces. Removes tabs.

[vlc] / modules / audio_filter / converter / a52tospdif.c

diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c
index 7d489d74b9200d6b688ea96ec7eff102c2b0f369..ed53abc875f689f2582939cb36a7380de6ba83af 100644 (file)
--- a/modules/audio_filter/converter/a52tospdif.c
+++ b/modules/audio_filter/converter/a52tospdif.c
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -28,14 +28,11 @@
 
 #include <vlc/vlc.h>
 
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
 
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
 
 /*****************************************************************************
  * Local prototypes
@@ -98,15 +95,15 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     /* Copy the S/PDIF headers. */
     if( p_filter->output.i_format == VLC_FOURCC('s','p','d','b') )
     {
-        p_filter->p_vlc->pf_memcpy( p_out, p_sync_be, 6 );
+        p_filter->p_libvlc->pf_memcpy( p_out, p_sync_be, 6 );
         p_out[4] = p_in[5] & 0x7; /* bsmod */
         p_out[6] = (i_frame_size >> 4) & 0xff;
         p_out[7] = (i_frame_size << 4) & 0xff;
-        p_filter->p_vlc->pf_memcpy( &p_out[8], p_in, i_frame_size * 2 );
+        p_filter->p_libvlc->pf_memcpy( &p_out[8], p_in, i_frame_size * 2 );
     }
     else
     {
-        p_filter->p_vlc->pf_memcpy( p_out, p_sync_le, 6 );
+        p_filter->p_libvlc->pf_memcpy( p_out, p_sync_le, 6 );
         p_out[5] = p_in[5] & 0x7; /* bsmod */
         p_out[6] = (i_frame_size << 4) & 0xff;
         p_out[7] = (i_frame_size >> 4) & 0xff;
@@ -122,7 +119,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
         }
 #endif
     }
-    p_filter->p_vlc->pf_memset( p_out + 8 + i_frame_size * 2, 0,
+    p_filter->p_libvlc->pf_memset( p_out + 8 + i_frame_size * 2, 0,
                                 AOUT_SPDIF_SIZE - i_frame_size * 2 - 8 );
 
     p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;