Skip to content

V
vlc-2-2
Commit b2167185 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Comments

parent 3d721ce8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
modules/codec/subtitles/subsdec.c
View file @ b2167185
...@@ -172,10 +172,10 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -172,10 +172,10 @@ static int OpenDecoder( vlc_object_t *p_this )
char *psz_charset = NULL; char *psz_charset = NULL;
/* First try demux-specified encoding */
if( p_dec->fmt_in.i_codec == VLC_FOURCC('t','1','4','0') ) if( p_dec->fmt_in.i_codec == VLC_FOURCC('t','1','4','0') )
psz_charset = strdup( "UTF-8" ); /* IUT T.140 is always using UTF-8 */ psz_charset = strdup( "UTF-8" ); /* IUT T.140 is always using UTF-8 */
else else
/* First try demux-specified encoding */
if( p_dec->fmt_in.subs.psz_encoding && *p_dec->fmt_in.subs.psz_encoding ) if( p_dec->fmt_in.subs.psz_encoding && *p_dec->fmt_in.subs.psz_encoding )
{ {
psz_charset = strdup (p_dec->fmt_in.subs.psz_encoding); psz_charset = strdup (p_dec->fmt_in.subs.psz_encoding);
...@@ -211,6 +211,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -211,6 +211,7 @@ static int OpenDecoder( vlc_object_t *p_this )
} }
} }
/* Forth, don't do character decoding, i.e. assume UTF-8 */
if (psz_charset == NULL) if (psz_charset == NULL)
{ {
psz_charset = strdup ("UTF-8"); psz_charset = strdup ("UTF-8");
...@@ -218,6 +219,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -218,6 +219,7 @@ static int OpenDecoder( vlc_object_t *p_this )
psz_charset ? psz_charset : "error"); psz_charset ? psz_charset : "error");
} }
/* Fifth, fail */
if (psz_charset == NULL) if (psz_charset == NULL)
{ {
free (p_sys); free (p_sys);
......
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