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

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Jun 27 00:21:40 2010 +0200| [038e01b86629e48e699791d98c266d16b7134fa1] | committer: Jean-Baptiste Kempf 

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  (BP as f4b1fb2eb0d93e60c751bd24bae9ccc9f3be6ed1)

      Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 77816bd..2ca105f 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -303,16 +303,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_fname );
-        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 )