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

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 5038cf9ca7d561ac534091cd7510cc39f7f1f06b..caf98286287290ca3ccce48ee776e543cace21ab 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -630,11 +630,7 @@ static int Open( vlc_object_t * p_this )
                 continue;
         }
         if( p_strn )
-        {
-            /* The charset of p_strn is undefined */
-            EnsureUTF8( p_strn->p_str );
-            fmt.psz_description = strdup( p_strn->p_str );
-        }
+            fmt.psz_description = FromLatin1( p_strn->p_str );
         if( tk->p_out_muxed == NULL )
             tk->p_es = es_out_Add( p_demux->out, &fmt );
         TAB_APPEND( p_sys->i_track, p_sys->track, tk );