A bit of headers cleanup

[vlc] / modules / codec / spudec / parse.c

diff --git a/modules/codec/spudec/parse.c b/modules/codec/spudec/parse.c
index 4589a661ef5e2e664974d99d1cbc35cfd3b0f859..f747c43818bebb3f0e2d59fc2e9b008184776a52 100644 (file)
--- a/modules/codec/spudec/parse.c
+++ b/modules/codec/spudec/parse.c
@@ -27,8 +27,8 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/decoder.h>
+#include <vlc_vout.h>
+#include <vlc_codec.h>
 
 #include "spudec.h"
 
@@ -71,6 +71,8 @@ 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;
+
     /* 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
      * on. This will speed things up a lot. Plus, we'll only need to do
@@ -145,8 +147,6 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu,
     uint8_t i_command = SPU_CMD_END;
     mtime_t date = 0;
 
-    unsigned int i, pi_alpha[4];
-
     /* Initialize the structure */
     p_spu->i_start = p_spu->i_stop = 0;
     p_spu->b_ephemer = VLC_FALSE;
@@ -216,6 +216,7 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu,
             if( p_dec->fmt_in.subs.spu.palette[0] == 0xBeeF )
             {
                 unsigned int idx[4];
+                int i;
 
                 p_spu_data->b_palette = VLC_TRUE;
 
@@ -556,9 +557,10 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu,
     /* Crop if necessary */
     if( i_skipped_top || i_skipped_bottom )
     {
+#ifdef DEBUG_SPUDEC
         int i_y = p_spu->i_y + i_skipped_top;
         int i_height = p_spu->i_height - (i_skipped_top + i_skipped_bottom);
-
+#endif
         p_spu_data->i_y_top_offset = i_skipped_top;
         p_spu_data->i_y_bottom_offset = i_skipped_bottom;
 #ifdef DEBUG_SPUDEC