X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fspudec%2Fparse.c;h=e10dc578f4d29eb32705b4a780cfe766e20ddfbe;hb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;hp=205a23ff05706e45d1818800afe90ee2576aa01f;hpb=05eac2dbdf9f3a3231dc2eefda62202837fdeec6;p=vlc

diff --git a/modules/codec/spudec/parse.c b/modules/codec/spudec/parse.c
index 205a23ff05..e10dc578f4 100644
--- a/modules/codec/spudec/parse.c
+++ b/modules/codec/spudec/parse.c
@@ -75,7 +75,7 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec )
     p_spu = p_dec->pf_spu_buffer_new( p_dec );
     if( !p_spu ) return NULL;
 
-    p_spu->b_pausable = VLC_TRUE;
+    p_spu->b_pausable = true;
 
     /* Rationale for the "p_spudec->i_rle_size * 4": we are going to
      * expand the RLE stuff so that we won't need to read nibbles later
@@ -83,8 +83,8 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec )
      * this stupid interlacing stuff once. */
     p_spu_data = malloc( sizeof(subpicture_data_t) + 4 * p_sys->i_rle_size );
     p_spu_data->p_data = (uint8_t *)p_spu_data + sizeof(subpicture_data_t);
-    p_spu_data->b_palette = VLC_FALSE;
-    p_spu_data->b_auto_crop = VLC_FALSE;
+    p_spu_data->b_palette = false;
+    p_spu_data->b_auto_crop = false;
     p_spu_data->i_y_top_offset = 0;
     p_spu_data->i_y_bottom_offset = 0;
 
@@ -156,7 +156,7 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu,
 
     /* Initialize the structure */
     p_spu->i_start = p_spu->i_stop = 0;
-    p_spu->b_ephemer = VLC_FALSE;
+    p_spu->b_ephemer = false;
 
     for( i_index = 4 + p_sys->i_rle_size; i_index < p_sys->i_spu_size ; )
     {
@@ -196,7 +196,7 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu,
         {
         case SPU_CMD_FORCE_DISPLAY: /* 00 (force displaying) */
             p_spu->i_start = p_spu_data->i_pts + date;
-            p_spu->b_ephemer = VLC_TRUE;
+            p_spu->b_ephemer = true;
             i_index += 1;
             break;
 
@@ -224,7 +224,7 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu,
                 unsigned int idx[4];
                 int i;
 
-                p_spu_data->b_palette = VLC_TRUE;
+                p_spu_data->b_palette = true;
 
                 idx[0] = (p_sys->buffer[i_index+1]>>4)&0x0f;
                 idx[1] = (p_sys->buffer[i_index+1])&0x0f;
@@ -279,7 +279,7 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu,
 
             /* Auto crop fullscreen subtitles */
             if( p_spu->i_height > 250 )
-                p_spu_data->b_auto_crop = VLC_TRUE;
+                p_spu_data->b_auto_crop = true;
 
             i_index += 7;
             break;
@@ -363,7 +363,7 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu,
     {
         /* This subtitle will live for 5 seconds or until the next subtitle */
         p_spu->i_stop = p_spu->i_start + (mtime_t)500 * 11000;
-        p_spu->b_ephemer = VLC_TRUE;
+        p_spu->b_ephemer = true;
     }
 
     /* Get rid of padding bytes */
@@ -407,7 +407,7 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu,
     unsigned int *pi_offset;
 
     /* Cropping */
-    vlc_bool_t b_empty_top = VLC_TRUE;
+    bool b_empty_top = true;
     unsigned int i_skipped_top = 0, i_skipped_bottom = 0;
     unsigned int i_transparent_code = 0;
  
@@ -487,7 +487,7 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu,
                     }
                     else
                     {
-                        p_spu_data->b_auto_crop = VLC_FALSE;
+                        p_spu_data->b_auto_crop = false;
                     }
                 }
 
@@ -512,7 +512,7 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu,
                     *p_dest++ = i_code;
 
                     /* Valid code means no blank line */
-                    b_empty_top = VLC_FALSE;
+                    b_empty_top = false;
                     i_skipped_bottom = 0;
                 }
             }