[vlc-commits] input: remove noslave_exts hack

Thomas Guillem git at videolan.org
Fri Feb 28 20:46:18 CET 2020


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Feb 13 16:15:18 2020 +0100| [d3007b0f39e8e24eeadd1db980ee746a02869651] | committer: Thomas Guillem

input: remove noslave_exts hack

This hack is no longuer needed, cf. previous commit.

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

 src/input/subtitles.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index fa31e41774..25ebb52087 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -44,9 +44,6 @@
  * The possible extensions for subtitle files we support
  */
 static const char *const sub_exts[] = { SLAVE_SPU_EXTENSIONS, "" };
-/* As core can't handle non default program hijacking by slaves,
- * we need to disable any SPU slave for those masters for now */
-static const char *const noslave_exts[] = { "m2ts", "ts" };
 
 static void strcpy_trim( char *d, const char *s )
 {
@@ -232,19 +229,6 @@ int subtitles_Detect( input_thread_t *p_this, char *psz_path, const char *psz_na
     if( !psz_fname )
         return VLC_EGENERIC;
 
-    const char *ext = strrchr( psz_fname, '.' );
-    if( ext != NULL )
-    {
-        for( size_t i=0; i<ARRAY_SIZE(noslave_exts); i++ )
-        {
-            if( !strcasecmp( &ext[1], noslave_exts[i] ) )
-            {
-                free( psz_fname );
-                return VLC_EGENERIC;
-            }
-        }
-    }
-
     /* extract filename & dirname from psz_fname */
     char *f_dir = strdup( psz_fname );
     if( f_dir == 0 )



More information about the vlc-commits mailing list