Fix previous commit. Sorry (messed up with Git squash)

[vlc] / modules / codec / subtitles / subsass.c

diff --git a/modules/codec/subtitles/subsass.c b/modules/codec/subtitles/subsass.c
index d8865f92d8d4737d49b4e1359804ae4469b96fd4..f483f05ec861e54d4c7e1671b23d66c6025e9f66 100644 (file)
--- a/modules/codec/subtitles/subsass.c
+++ b/modules/codec/subtitles/subsass.c
@@ -121,7 +121,7 @@ void ParseSSAString( decoder_t *p_dec,
         if( !strcmp( p_sys->pp_ssa_styles[i]->psz_stylename, psz_style ) )
             p_style = p_sys->pp_ssa_styles[i];
     }
-    if( psz_style ) free( psz_style );
+    free( psz_style );
 
     p_spu->p_region->psz_text = psz_new_subtitle;
     if( p_style == NULL )
@@ -201,14 +201,14 @@ void ParseSSAHeader( decoder_t *p_dec )
             p_sys->i_original_height = ( temp > 0 ) ? temp : -1;
         else if( sscanf( psz_parser, "Script Type: %8192s", buffer_text ) == 1 )
         {
-            if( !strcasecmp( buffer_text, "V4.00+" ) ) p_sys->b_ass = VLC_TRUE;
+            if( !strcasecmp( buffer_text, "V4.00+" ) ) p_sys->b_ass = true;
         }
         else if( !strncasecmp( psz_parser, "[V4 Styles]", 11 ) )
             i_section_type = 1;
         else if( !strncasecmp( psz_parser, "[V4+ Styles]", 12) )
         {
             i_section_type = 2;
-            p_sys->b_ass = VLC_TRUE;
+            p_sys->b_ass = true;
         }
         else if( !strncasecmp( psz_parser, "[Events]", 8 ) )
             i_section_type = 4;
@@ -353,7 +353,7 @@ void ParseSSAHeader( decoder_t *p_dec )
     }
 
 eof:
-    if( psz_header ) free( psz_header );
+    free( psz_header );
     return;
 }