libmad plug-in, courtesy of Jean-Paul Saman <jpsaman@wxs.nl>.

[vlc] / src / interface / intf_channels.c

diff --git a/src/interface/intf_channels.c b/src/interface/intf_channels.c
index f6ad68111a0407122683844ca792c7d5a31059b3..ef364e8975808e5ad833ce8b98dceafb996f2ea9 100644 (file)
--- a/src/interface/intf_channels.c
+++ b/src/interface/intf_channels.c
@@ -1,9 +1,10 @@
 /*****************************************************************************
  * intf_channels.c: channel handling functions
  *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
+ * Copyright (C) 1998-2001 VideoLAN
+ * $Id: intf_channels.c,v 1.4 2001/11/28 15:08:06 massiot Exp $
  *
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,10 +33,10 @@
 
 #include "config.h"
 #include "common.h"
+#include "intf_msg.h"
 #include "threads.h"
 #include "mtime.h"
 
-#include "intf_msg.h"
 #include "intf_channels.h"
 #include "interface.h"
 
@@ -91,9 +92,9 @@ int intf_LoadChannels( intf_thread_t *p_intf, char *psz_filename )
 
     if( i_index != 0 )
     {
-        /* Allocate array and rewind - some of the lines may be invalid, and the
-         * array will probably be larger than the actual number of channels, but
-         * it has no consequence. */
+        /* Allocate array and rewind - some of the lines may be invalid,
+         * and the array will probably be larger than the actual number of
+         * channels, but it has no consequences. */
         p_intf->p_channel = malloc( sizeof( intf_channel_t ) * i_index );
         if( p_intf->p_channel == NULL )
         {
@@ -295,7 +296,7 @@ static int ParseChannel( intf_channel_t *p_channel, char *psz_str )
                     i_field = -1;
                 }
                 break;
-            case 5:                                          /* input vlan id */
+            case 5:                                         /* input vlan id */
                 p_channel->i_input_vlan_id = strtol( psz_str, &psz_end, 0);
                 if( (*psz_str == '\0') || (*psz_end != '\0') )
                 {