[vlc-devel] commit: AVI: fix track names character set (fixes #2334) ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Tue Dec 16 19:58:26 2008 +0200| [6b40432a9d9acb294f38857f0b2a5584029c9edb] | committer: Rémi Denis-Courmont 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6b40432a9d9acb294f38857f0b2a5584029c9edb
---

 modules/demux/avi/avi.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 5038cf9..caf9828 100644
--- 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 );