[vlc-devel] [RFC PATCH 2/2] input: remove noslave_exts hack

[Thomas Guillem]

On Fri, Feb 14, 2020, at 11:59, Rémi Denis-Courmont wrote:
> Hi,
> 
> This work-around exists to prevent completely breaking TS due to subtitle files. I don't think we should remove it.

Hi,

I don't get it. This is what my first patch is fixing.

> 
> Le 13 février 2020 18:27:59 GMT+02:00, Thomas Guillem <thomas at gllm.fr> a écrit :
>>  src/input/subtitles.c | 16 ----------------
>>  1 file changed, 16 deletions(-)
>> 
>> diff --git a/src/input/subtitles.c b/src/input/subtitles.c
>> index fa31e41774a..25ebb52087f 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 )
> 
> -- 
> Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté. 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20200217/982e16e4/attachment.html>