* subsdec.c: use es_forma_t.subs.psz_encoding if present.

modules/codec/subsdec.c

@@ -2,7 +2,7 @@
  * subsdec.c : text subtitles decoder
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: subsdec.c,v 1.17 2004/01/25 20:40:59 gbazin Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *          Samuel Hocevar <sam@zoy.org>
@@ -144,6 +144,15 @@ static int OpenDecoder( vlc_object_t *p_this )
     p_sys->i_align = val.i_int;
 
 #if defined(HAVE_ICONV)
+    if( p_dec->fmt_in.subs.psz_encoding && *p_dec->fmt_in.subs.psz_encoding )
+    {
+        msg_Dbg( p_dec, "using character encoding: %s",
+                 p_dec->fmt_in.subs.psz_encoding );
+        p_sys->iconv_handle = iconv_open( "UTF-8",
+                                          p_dec->fmt_in.subs.psz_encoding );
+    }
+    else
+    {
         var_Create( p_dec, "subsdec-encoding",
                     VLC_VAR_STRING | VLC_VAR_DOINHERIT );
         var_Get( p_dec, "subsdec-encoding", &val );
@@ -167,16 +176,12 @@ static int OpenDecoder( vlc_object_t *p_this )
         }
 
         if( val.psz_string ) free( val.psz_string );
+    }
 #else
 
     msg_Dbg( p_dec, "no iconv support available" );
 #endif
 
-#if 0
-    if( p_demux_data )
-        msg_Dbg( p_dec, p_demux_data->psz_header );
-#endif
-
     return VLC_SUCCESS;
 }