[vlc-commits] commit: Revert " Do not scan for subtitles files in the current dir for TS files" ( Laurent Aimar )

git at videolan.org git at videolan.org
Sun Jun 27 19:04:46 CEST 2010


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Jun 27 00:21:40 2010 +0200| [bfe5bcce4f973f0ff1223cbf177295f7a93bfb15] | committer: Laurent Aimar 

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

This reverts commit c6ab39323aacc0d62f0908a3f526e93261de62e2.

It is not needed anymore with 769aa8d3f72623abd2543a84d90eba21c89e3f45.

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

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

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 9976bac..2b5e57e 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -282,15 +282,6 @@ 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