[vlc-commits] commit: Do not scan for subtitles files in the current dir for TS files ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Mon May 31 15:42:27 CEST 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon May 31 16:31:35 2010 +0300| [c6ab39323aacc0d62f0908a3f526e93261de62e2] | committer: Rémi Denis-Courmont 

Do not scan for subtitles files in the current dir for TS files

This should work around #3547.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c6ab39323aacc0d62f0908a3f526e93261de62e2
---

 src/input/subtitles.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 2b5e57e..9976bac 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -282,6 +282,15 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
 
     i_fname_len = strlen( f_fname );
 
+    /* HACK: do not look for subtitles for Transport Streams */
+    /* This breaks the clock synchronization */
+    if( i_fname_len > 3 && !strcasecmp( f_fname + i_fname_len - 3, ".ts" ) )
+    {
+        free( f_dir );
+        free( psz_fname );
+        return NULL;
+    }
+
     f_fname_noext = malloc(i_fname_len + 1);
     f_fname_trim = malloc(i_fname_len + 1 );
     if( !f_fname_noext || !f_fname_trim )



More information about the vlc-commits mailing list