Skip to content

V
vlc-2-2
Commit f188c1f5 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

input: Allow NULL item name.

parent f39e70a2
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
src/input/item.c
View file @ f188c1f5
......@@ -277,7 +277,7 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
if( psz_name != NULL )
p_input->psz_name = strdup( psz_name );
else if( p_input->i_type == ITEM_TYPE_FILE )
else if( p_input->i_type == ITEM_TYPE_FILE && p_input->psz_uri )
{
const char *psz_filename = strrchr( p_input->psz_uri, DIR_SEP_CHAR );
if( psz_filename && *psz_filename == DIR_SEP_CHAR )
......@@ -286,7 +286,7 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
? psz_filename : p_input->psz_uri );
}
else
p_input->psz_name = strdup( p_input->psz_uri );
p_input->psz_name = p_input->psz_uri ? strdup( p_input->psz_uri ) : NULL;
p_input->i_duration = i_duration;
......@@ -318,6 +318,12 @@ static void GuessType( input_item_t *p_item)
{ NULL, 0 }
};
if( !p_item->psz_uri )
{
p_item->i_type = ITEM_TYPE_FILE;
return;
}
for( i = 0; types_array[i].psz_search != NULL; i++ )
{
if( !strncmp( p_item->psz_uri, types_array[i].psz_search,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment