Skip to content

V
vlc-2-2
Commit 167f75fb authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

taglib: dont decode psz_file as URI

parent cf45f507
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
modules/meta_engine/taglib.cpp
View file @ 167f75fb
...@@ -361,20 +361,26 @@ static int ReadMeta( vlc_object_t* p_this) ...@@ -361,20 +361,26 @@ static int ReadMeta( vlc_object_t* p_this)
if( strcmp( p_demux->psz_access, "file" ) ) if( strcmp( p_demux->psz_access, "file" ) )
return VLC_EGENERIC; return VLC_EGENERIC;
char *psz_path = decode_URI_duplicate( p_demux->psz_file ); char *psz_path = strdup( p_demux->psz_file );
if( !psz_path ) if( !psz_path )
return VLC_ENOMEM; return VLC_ENOMEM;
#if defined(WIN32) || defined (UNDER_CE) #if defined(WIN32) || defined (UNDER_CE)
wchar_t wpath[MAX_PATH + 1]; wchar_t wpath[MAX_PATH + 1];
if( !MultiByteToWideChar( CP_UTF8, 0, psz_path, -1, wpath, MAX_PATH) ) if( !MultiByteToWideChar( CP_UTF8, 0, psz_path, -1, wpath, MAX_PATH) )
{
free( psz_path );
return VLC_EGENERIC; return VLC_EGENERIC;
}
wpath[MAX_PATH] = L'\0'; wpath[MAX_PATH] = L'\0';
f = FileRef( wpath ); f = FileRef( wpath );
#else #else
const char* local_name = ToLocale( psz_path ); const char* local_name = ToLocale( psz_path );
if( !local_name ) if( !local_name )
{
free( psz_path );
return VLC_EGENERIC; return VLC_EGENERIC;
}
f = FileRef( local_name ); f = FileRef( local_name );
LocaleFree( local_name ); LocaleFree( local_name );
#endif #endif
......
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