[vlc-commits] subtitles: Do as stated in the doc.
Hugo Beauzée-Luyssen
git at videolan.org
Tue Apr 10 17:14:23 CEST 2012
vlc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Tue Apr 10 16:43:16 2012 +0200| [8748391fd5f6d31fad420eb7e23d004a55698774] | committer: Hugo Beauzée-Luyssen
subtitles: Do as stated in the doc.
("0 = no subtitles autodetected\n")
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8748391fd5f6d31fad420eb7e23d004a55698774
---
src/input/subtitles.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 1e1a6ea..e53d9c0 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -247,7 +247,9 @@ static char **paths_to_list( const char *psz_dir, char *psz_path )
char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
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;
char *f_fname_noext = NULL, *f_fname_trim = NULL;
@@ -297,8 +299,6 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
strcpy_strip_ext( f_fname_noext, f_fname );
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) */
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++ )
More information about the vlc-commits
mailing list