Disable live555 in distcheck

[vlc] / src / input / subtitles.c

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index ed1c26790352c90b577177128ab3d3f7b253188a..4361f80c88b9baac249cbf395ae85e3856b2b20e 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -27,7 +27,11 @@
  *  This file contains functions to dectect subtitle files.
  */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_charset.h>
 
@@ -35,9 +39,7 @@
 #   include <dirent.h>
 #endif
 
-#ifdef HAVE_LIMITS_H
-#   include <limits.h>
-#endif
+#include <limits.h>
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
@@ -291,8 +293,8 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
     }
     if( !f_fname || !f_dir )
     {
-        FREE( f_fname );
-        FREE( f_dir );
+        free( f_fname );
+        free( f_dir );
         return NULL;
     }
 
@@ -302,10 +304,10 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
     f_fname_trim = malloc(i_fname_len + 1 );
     if( !f_fname_noext || !f_fname_trim )
     {
-        FREE( f_fname );
-        FREE( f_dir );
-        FREE( f_fname_noext );
-        FREE( f_fname_trim );
+        free( f_fname );
+        free( f_dir );
+        free( f_fname_noext );
+        free( f_fname_trim );
         return NULL;
     }
 
@@ -408,14 +410,14 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
         if( ppsz_dir_content )
         {
             for( a = 0; a < i_dir_content; a++ )
-                FREE( ppsz_dir_content[a] );
+                free( ppsz_dir_content[a] );
             free( ppsz_dir_content );
         }
     }
     if( subdirs )
     {
         for( j = 0; subdirs[j]; j++ )
-            FREE( subdirs[j] );
+            free( subdirs[j] );
         free( subdirs );
     }
     free( f_fname );
@@ -432,7 +434,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
 
     for( j = 0, i_result2 = 0; j < i_sub_count && result2 != NULL; j++ )
     {
-        vlc_bool_t b_reject = VLC_FALSE;
+        bool b_reject = false;
 
         if( !result[j].psz_fname || !result[j].psz_ext ) /* memory out */
             break;
@@ -449,12 +451,12 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
                     break;
             }
             if( i < i_sub_count )
-                b_reject = VLC_TRUE;
+                b_reject = true;
         }
         else if( !strcasecmp( result[j].psz_ext, "cdg" ) )
         {
             if( result[j].priority < SUB_PRIORITY_MATCH_ALL )
-                b_reject = VLC_TRUE;
+                b_reject = true;
         }
 
         /* */
@@ -464,8 +466,8 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
 
     for( j = 0; j < i_sub_count; j++ )
     {
-        FREE( result[j].psz_fname );
-        FREE( result[j].psz_ext );
+        free( result[j].psz_fname );
+        free( result[j].psz_ext );
     }
     free( result );