Commit 067cd23c authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen Committed by Jean-Baptiste Kempf

subtitles: Do as stated in the doc.

("0 = no subtitles autodetected\n")
(cherry picked from commit 8748391fd5f6d31fad420eb7e23d004a55698774)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 84cb4eb9
...@@ -249,7 +249,9 @@ static char **paths_to_list( const char *psz_dir, char *psz_path ) ...@@ -249,7 +249,9 @@ static char **paths_to_list( const char *psz_dir, char *psz_path )
char **subtitles_Detect( input_thread_t *p_this, char *psz_path, char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
const char *psz_name_org ) const char *psz_name_org )
{ {
int i_fuzzy; int i_fuzzy = var_GetInteger( p_this, "sub-autodetect-fuzzy" );
if ( i_fuzzy == 0 )
return NULL;
int j, i_result2, i_sub_count, i_fname_len; int j, i_result2, i_sub_count, i_fname_len;
char *f_fname_noext = NULL, *f_fname_trim = NULL; char *f_fname_noext = NULL, *f_fname_trim = NULL;
...@@ -299,8 +301,6 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path, ...@@ -299,8 +301,6 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
strcpy_strip_ext( f_fname_noext, f_fname ); strcpy_strip_ext( f_fname_noext, f_fname );
strcpy_trim( f_fname_trim, f_fname_noext ); strcpy_trim( f_fname_trim, f_fname_noext );
i_fuzzy = var_GetInteger( p_this, "sub-autodetect-fuzzy" );
result = calloc( MAX_SUBTITLE_FILES+1, sizeof(vlc_subfn_t) ); /* We check it later (simplify code) */ result = calloc( MAX_SUBTITLE_FILES+1, sizeof(vlc_subfn_t) ); /* We check it later (simplify code) */
subdirs = paths_to_list( f_dir, psz_path ); subdirs = paths_to_list( f_dir, psz_path );
for( j = -1, i_sub_count = 0; (j == -1) || ( j >= 0 && subdirs != NULL && subdirs[j] != NULL ); j++ ) for( j = -1, i_sub_count = 0; (j == -1) || ( j >= 0 && subdirs != NULL && subdirs[j] != NULL ); j++ )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment