libmpeg2: Only define GetCC when needed.

[vlc] / modules / codec / svcdsub.c

diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index 6afddccc582b0fef7743b98eaf2e8c66259f6e2c..fbb424f164c4a09bb70c39e622dcfd73e97f1941 100644 (file)
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -35,7 +35,7 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_osd.h>
-#include "vlc_bits.h"
+#include <vlc_bits.h>
 
 /*****************************************************************************
  * Module descriptor.
@@ -546,9 +546,9 @@ static void SVCDSubRenderImage( decoder_t *p_dec, block_t *p_data,
     int i_field;            /* The subtitles are interlaced */
     int i_row, i_column;    /* scanline row/column number */
     uint8_t i_color, i_count;
-    bs_t bs;
+    bsw_t bs;
 
-    bs_init( &bs, p_data->p_buffer + p_sys->i_image_offset,
+    bsw_init_writable( &bs, p_data->p_buffer + p_sys->i_image_offset,
              p_data->i_buffer - p_sys->i_image_offset );
 
     for( i_field = 0; i_field < 2; i_field++ )
@@ -557,8 +557,8 @@ static void SVCDSubRenderImage( decoder_t *p_dec, block_t *p_data,
         {
             for( i_column = 0; i_column < p_sys->i_width; i_column++ )
             {
-                i_color = bs_read( &bs, 2 );
-                if( i_color == 0 && (i_count = bs_read( &bs, 2 )) )
+                i_color = bsw_read( &bs, 2 );
+                if( i_color == 0 && (i_count = bsw_read( &bs, 2 )) )
                 {
                     i_count = __MIN( i_count, p_sys->i_width - i_column );
                     memset( &p_dest[i_row * p_region->p_picture->Y_PITCH +
@@ -570,11 +570,11 @@ static void SVCDSubRenderImage( decoder_t *p_dec, block_t *p_data,
                 p_dest[i_row * p_region->p_picture->Y_PITCH + i_column] = i_color;
             }
 
-            bs_align( &bs );
+            bsw_align( &bs );
         }
 
         /* odd field */
-        bs_init( &bs, p_data->p_buffer + p_sys->i_image_offset +
+        bsw_init_writable( &bs, p_data->p_buffer + p_sys->i_image_offset +
                  p_sys->second_field_offset,
                  p_data->i_buffer - p_sys->i_image_offset -
                  p_sys->second_field_offset );