Copyright fixes

[vlc] / src / input / subtitles.c

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 219c844db1e7c59c4373187642803dc12fee4951..751562c061f542dad1fc7c05630c70ae68784b5e 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * subtitles.c
  *****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2004 VideoLAN (Centrale Réseaux) and its contributors
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan.org>
@@ -33,8 +33,6 @@
 
 #ifdef HAVE_DIRENT_H
 #   include <dirent.h>
-#else
-#   include "../extras/dirent.h"
 #endif
 
 #include <ctype.h>
@@ -407,7 +405,8 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
             for( j = 0; j < i_sub_count; j++ )
             {
                 if( result[j].psz_fname && result[i].psz_fname &&
-                    !strncasecmp( result[i].psz_fname, result[j].psz_fname, sizeof( result[i].psz_fname) - 4 ) )
+                    !strncasecmp( result[i].psz_fname, result[j].psz_fname, sizeof( result[i].psz_fname) - 4 ) && 
+                    !strcasecmp( result[j].psz_ext, "idx" ) )
                     break;
                 
             }
@@ -423,7 +422,6 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
             i_result2++;
         }
     }
-    result2[i_result2+1] = NULL;
     free( result );
     return result2;
 }