Skip to content

V
vlc-1.1
Commit 6b40432a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

AVI: fix track names character set (fixes #2334)

parent c25958fb
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
modules/demux/avi/avi.c
View file @ 6b40432a
...@@ -630,11 +630,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -630,11 +630,7 @@ static int Open( vlc_object_t * p_this )
continue; continue;
} }
if( p_strn ) if( p_strn )
{ fmt.psz_description = FromLatin1( p_strn->p_str );
/* The charset of p_strn is undefined */
EnsureUTF8( p_strn->p_str );
fmt.psz_description = strdup( p_strn->p_str );
}
if( tk->p_out_muxed == NULL ) if( tk->p_out_muxed == NULL )
tk->p_es = es_out_Add( p_demux->out, &fmt ); tk->p_es = es_out_Add( p_demux->out, &fmt );
TAB_APPEND( p_sys->i_track, p_sys->track, tk ); TAB_APPEND( p_sys->i_track, p_sys->track, tk );
......
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