X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_mixer%2Fspdif.c;h=6426a2ced1a93e9a574060a1ecbdaf73eb66cc72;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=e21fc7b7cb8bea9f076a3a323f06ab1e115f1d76;hpb=4b9f4ff644a2bec2461a882fb4e064195cf19b2d;p=vlc

diff --git a/modules/audio_mixer/spdif.c b/modules/audio_mixer/spdif.c
index e21fc7b7cb..6426a2ced1 100644
--- a/modules/audio_mixer/spdif.c
+++ b/modules/audio_mixer/spdif.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * spdif.c : dummy mixer for S/PDIF output (1 input only)
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002 the VideoLAN team
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -10,7 +10,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
@@ -18,18 +18,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <vlc/vlc.h>
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
 
 /*****************************************************************************
  * Local prototypes
@@ -42,6 +39,8 @@ static void DoWork    ( aout_instance_t *, aout_buffer_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
+    set_category( CAT_AUDIO );
+    set_subcategory( SUBCAT_AUDIO_MISC );
     set_description( _("Dummy S/PDIF audio mixer") );
     set_capability( "audio mixer", 1 );
     set_callbacks( Create, NULL );
@@ -89,7 +88,7 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
         p_input = p_aout->pp_inputs[i];
         if ( p_input->b_error ) continue;
         p_fifo = &p_input->fifo;
-        p_deleted = p_fifo->p_first;  
+        p_deleted = p_fifo->p_first;
         while ( p_deleted != NULL )
         {
             aout_buffer_t * p_next = p_deleted->p_next;