6 files changed, 12 insertions, 16 deletions
diff --git a/src/libmpeg2/header.c b/src/libmpeg2/header.c
index e435fb405..7f1ef1fc8 100644
--- a/src/libmpeg2/header.c
+++ b/src/libmpeg2/header.c
@@ -34,7 +34,7 @@
 #include "attributes.h"
 
 /* default intra quant matrix, in zig-zag order */
-static uint8_t default_intra_quantizer_matrix[64] ATTR_ALIGN(16) = {
+static const uint8_t default_intra_quantizer_matrix[64] ATTR_ALIGN(16) = {
     8,
     16, 16,
     19, 16, 19,
diff --git a/src/libmpeg2/idct_altivec.c b/src/libmpeg2/idct_altivec.c
index d5737331d..2ebdd3241 100644
--- a/src/libmpeg2/idct_altivec.c
+++ b/src/libmpeg2/idct_altivec.c
@@ -489,7 +489,7 @@ void mpeg2_idct_add_altivec (int16_t * block, uint8_t * dest, int stride)
 	 );
 }
 
-static int16_t constants[5][8] ATTR_ALIGN(16) __attribute__((used)) = {
+static const int16_t constants[5][8] ATTR_ALIGN(16) __attribute__((used)) = {
     {23170, 13573, 6518, 21895, -23170, -21895, 32, 31},
     {16384, 22725, 21407, 19266, 16384, 19266, 21407, 22725},
     {22725, 31521, 29692, 26722, 22725, 26722, 29692, 31521},
diff --git a/src/libmpeg2/slice_xvmc.c b/src/libmpeg2/slice_xvmc.c
index 1ef3fb585..fb0fab1e9 100644
--- a/src/libmpeg2/slice_xvmc.c
+++ b/src/libmpeg2/slice_xvmc.c
@@ -46,7 +46,7 @@
 #include "vlc.h"
 /* original (non-patched) scan tables */
 
-static uint8_t mpeg2_scan_norm_orig[64] ATTR_ALIGN(16) =
+static const uint8_t mpeg2_scan_norm_orig[64] ATTR_ALIGN(16) =
 {
     /* Zig-Zag scan pattern */
      0, 1, 8,16, 9, 2, 3,10,
@@ -59,7 +59,7 @@ static uint8_t mpeg2_scan_norm_orig[64] ATTR_ALIGN(16) =
     53,60,61,54,47,55,62,63
 };
 
-static uint8_t mpeg2_scan_alt_orig[64] ATTR_ALIGN(16) =
+static const uint8_t mpeg2_scan_alt_orig[64] ATTR_ALIGN(16) =
 {
     /* Alternate scan pattern */
     0,8,16,24,1,9,2,10,17,25,32,40,48,56,57,49,
@@ -68,9 +68,9 @@ static uint8_t mpeg2_scan_alt_orig[64] ATTR_ALIGN(16) =
     53,61,22,30,7,15,23,31,38,46,54,62,39,47,55,63
 };
 
-uint8_t mpeg2_scan_alt_ptable[64] ATTR_ALIGN(16);
-uint8_t mpeg2_scan_norm_ptable[64] ATTR_ALIGN(16);
-uint8_t mpeg2_scan_orig_ptable[64] ATTR_ALIGN(16);
+static uint8_t mpeg2_scan_alt_ptable[64] ATTR_ALIGN(16);
+static uint8_t mpeg2_scan_norm_ptable[64] ATTR_ALIGN(16);
+static uint8_t mpeg2_scan_orig_ptable[64] ATTR_ALIGN(16);
 
 void xvmc_setup_scan_ptable( void )
 {
@@ -83,7 +83,7 @@ void xvmc_setup_scan_ptable( void )
 }
     
 
-static int non_linear_quantizer_scale [] = {
+static const int non_linear_quantizer_scale [] = {
     0,  1,  2,  3,  4,  5,   6,   7,
     8, 10, 12, 14, 16, 18,  20,  22,
     24, 28, 32, 36, 40, 44,  48,  52,
diff --git a/src/libmpeg2/slice_xvmc_vld.c b/src/libmpeg2/slice_xvmc_vld.c
index 3647c7386..7e370a519 100644
--- a/src/libmpeg2/slice_xvmc_vld.c
+++ b/src/libmpeg2/slice_xvmc_vld.c
@@ -23,7 +23,7 @@
 #include "mpeg2_internal.h"
 #include "xvmc_vld.h"
 
-static uint8_t zig_zag_scan[64] ATTR_ALIGN(16) =
+static const uint8_t zig_zag_scan[64] ATTR_ALIGN(16) =
 {
     /* Zig-Zag scan pattern */
      0, 1, 8,16, 9, 2, 3,10,
@@ -36,7 +36,7 @@ static uint8_t zig_zag_scan[64] ATTR_ALIGN(16) =
     53,60,61,54,47,55,62,63
 };
 
-static uint8_t alternate_scan [64] ATTR_ALIGN(16) =
+static const uint8_t alternate_scan [64] ATTR_ALIGN(16) =
 {
     /* Alternate scan pattern */
     0,8,16,24,1,9,2,10,17,25,32,40,48,56,57,49,
diff --git a/src/libmpeg2/xine_decoder.c b/src/libmpeg2/xine_decoder.c
index 7dcb2a831..17957a6d3 100644
--- a/src/libmpeg2/xine_decoder.c
+++ b/src/libmpeg2/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.57 2006/05/03 19:46:08 dsalt Exp $
+ * $Id: xine_decoder.c,v 1.58 2006/06/02 22:18:57 dsalt Exp $
  *
  * stuff needed to turn libmpeg2 into a xine decoder plugin
  */
@@ -172,7 +172,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
 static uint32_t supported_types[] = { BUF_VIDEO_MPEG, 0 };
 
-static decoder_info_t dec_info_mpeg2 = {
+static const decoder_info_t dec_info_mpeg2 = {
   supported_types,     /* supported types */
   7                    /* priority        */
 };
diff --git a/src/libmpeg2/xvmc.h b/src/libmpeg2/xvmc.h
index e6204395d..5d61bcf83 100644
--- a/src/libmpeg2/xvmc.h
+++ b/src/libmpeg2/xvmc.h
@@ -26,10 +26,6 @@
 
 /* slice_xvmc.c */
 
-extern uint8_t mpeg2_scan_alt_ptable[64] ATTR_ALIGN(16);
-extern uint8_t mpeg2_scan_norm_ptable[64] ATTR_ALIGN(16);
-extern uint8_t mpeg2_scan_orig_ptable[64] ATTR_ALIGN(16);
-
 void mpeg2_xvmc_slice (mpeg2dec_accel_t *accel, picture_t * picture, int code, uint8_t * buffer);
 void xvmc_setup_scan_ptable( void );