[vlc-commits] codec: cc: missing EnsureUtf8
Francois Cartegnie
git at videolan.org
Wed Aug 5 13:55:18 CEST 2015
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Aug 5 13:53:43 2015 +0200| [2dc335b1542ba31d03f9debe7597f41d8b451ffa] | committer: Francois Cartegnie
codec: cc: missing EnsureUtf8
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2dc335b1542ba31d03f9debe7597f41d8b451ffa
---
modules/codec/cc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index e8e406b..f408e07 100644
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -309,8 +309,6 @@ static subpicture_t *Subtitle( decoder_t *p_dec, text_segment_t *p_segments, mti
return NULL;
}
- //EnsureUTF8( psz_subtitle );
-
/* Create the subpicture unit */
p_spu = decoder_NewSubpictureText( p_dec );
if( !p_spu )
@@ -972,6 +970,7 @@ static text_segment_t * Eia608TextLine( struct eia608_screen *screen, int i_row,
if(font != prev_font || color != prev_color)
{
+ EnsureUTF8(psz_text);
p_segment->psz_text = strdup(psz_text);
psz_text[0] = '\0';
p_segment->p_next = text_segment_New( NULL );
@@ -1027,6 +1026,7 @@ static text_segment_t * Eia608TextLine( struct eia608_screen *screen, int i_row,
if( p_segment )
{
assert(!p_segment->psz_text); // shouldn't happen
+ EnsureUTF8(psz_text);
p_segment->psz_text = strdup(psz_text);
}
More information about the vlc-commits
mailing list