vlc | branch: master | John Stebbins <[email protected]> | Thu Apr  3 
11:08:02 2014 -0600| [2f966bd6edebb262b4e5e0977d84c9737e8043c1] | committer: 
Francois Cartegnie

substx3g: Allow multiple simultanious face styles

Signed-off-by: Francois Cartegnie <[email protected]>

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

 modules/codec/substx3g.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/substx3g.c b/modules/codec/substx3g.c
index a735f45..b542ffc 100644
--- a/modules/codec/substx3g.c
+++ b/modules/codec/substx3g.c
@@ -80,9 +80,9 @@ static int ConvertFlags( int i_atomflags )
     int i_vlcstyles_flags = 0;
     if ( i_atomflags & FONT_FACE_BOLD )
         i_vlcstyles_flags |= STYLE_BOLD;
-    else if ( i_atomflags & FONT_FACE_ITALIC )
+    if ( i_atomflags & FONT_FACE_ITALIC )
         i_vlcstyles_flags |= STYLE_ITALIC;
-    else if ( i_atomflags & FONT_FACE_UNDERLINE )
+    if ( i_atomflags & FONT_FACE_UNDERLINE )
         i_vlcstyles_flags |= STYLE_UNDERLINE;
     return i_vlcstyles_flags;
 }

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to