6 files changed, 18 insertions, 18 deletions
diff --git a/src/video_dec/libvdpau/alterh264_bits_reader.h b/src/video_dec/libvdpau/alterh264_bits_reader.h
index e32747a85..90f17718f 100644
--- a/src/video_dec/libvdpau/alterh264_bits_reader.h
+++ b/src/video_dec/libvdpau/alterh264_bits_reader.h
@@ -29,14 +29,14 @@
 
 
 typedef struct {
-  uint8_t *buffer, *start;
+  const uint8_t *buffer, *start;
   int offbits, length, oflow;
 } bits_reader_t;
 
 
 
 static void
-bits_reader_set (bits_reader_t * br, uint8_t * buf, int len)
+bits_reader_set (bits_reader_t * br, const uint8_t * buf, int len)
 {
   br->buffer = br->start = buf;
   br->offbits = 0;
@@ -50,7 +50,7 @@ static inline uint32_t
 more_rbsp_data (bits_reader_t * br)
 {
   uint8_t val[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
-  uint8_t *buf = br->start + br->length;
+  const uint8_t *buf = br->start + br->length;
   int bit;
 
   while (--buf >= br->buffer)
diff --git a/src/video_dec/libvdpau/alterh264_decode.c b/src/video_dec/libvdpau/alterh264_decode.c
index 8eaeafa05..582e02692 100644
--- a/src/video_dec/libvdpau/alterh264_decode.c
+++ b/src/video_dec/libvdpau/alterh264_decode.c
@@ -1998,12 +1998,12 @@ parse_startcodes (vdpau_h264_alter_decoder_t * this_gen, uint8_t * buf,
 
 
 static void
-parse_codec_private (vdpau_h264_alter_decoder_t * this_gen, uint8_t * buf,
+parse_codec_private (vdpau_h264_alter_decoder_t * this_gen, const uint8_t * buf,
 		     uint32_t len)
 {
   sequence_t *sequence = (sequence_t *) & this_gen->sequence;
   bits_reader_set (&sequence->br, buf, len);
-  uint8_t *buffer = buf;
+  const uint8_t *buffer = buf;
   int i;
 
   lprintf ("parse_codec_private\n");
@@ -2116,7 +2116,7 @@ vdpau_h264_alter_decode_data (video_decoder_t * this_gen, buf_element_t * buf)
     {
       lprintf ("BUF_SPECIAL_DECODER_CONFIG\n");
       seq->flag_header = 1;
-      uint8_t *codec_private = buf->decoder_info_ptr[2];
+      const uint8_t *codec_private = buf->decoder_info_ptr[2];
       uint32_t codec_private_len = buf->decoder_info[2];
       if (codec_private_len > 0)
 	parse_codec_private (this, codec_private, codec_private_len);
diff --git a/src/video_dec/libvdpau/bits_reader.h b/src/video_dec/libvdpau/bits_reader.h
index 1ce939f35..ae0dfaa20 100644
--- a/src/video_dec/libvdpau/bits_reader.h
+++ b/src/video_dec/libvdpau/bits_reader.h
@@ -24,13 +24,13 @@
 
 
 typedef struct {
-  uint8_t *buffer, *start;
+  const uint8_t *buffer, *start;
   int      offbits, length, oflow;
 } bits_reader_t;
 
 
 
-static void bits_reader_set( bits_reader_t *br, uint8_t *buf, int len )
+static void bits_reader_set( bits_reader_t *br, const uint8_t *buf, int len )
 {
   br->buffer = br->start = buf;
   br->offbits = 0;
@@ -56,7 +56,7 @@ static uint32_t get_bits( bits_reader_t *br, int nbits )
 {
   int i, nbytes;
   uint32_t ret = 0;
-  uint8_t *buf;
+  const uint8_t *buf;
 
   buf = br->buffer;
   nbytes = (br->offbits + nbits)/8;
diff --git a/src/video_dec/libvdpau/h264_parser.c b/src/video_dec/libvdpau/h264_parser.c
index 01033e2cc..29d847e66 100644
--- a/src/video_dec/libvdpau/h264_parser.c
+++ b/src/video_dec/libvdpau/h264_parser.c
@@ -51,8 +51,8 @@ uint8_t default_8x8_inter[64] = { 9, 13, 13, 15, 13, 15, 17, 17, 17, 17, 19,
 
 struct buf_reader
 {
-  uint8_t *buf;
-  uint8_t *cur_pos;
+  const uint8_t *buf;
+  const uint8_t *cur_pos;
   int len;
   int cur_offset;
 };
@@ -210,9 +210,9 @@ static inline uint32_t read_bits(struct buf_reader *buf, int len)
 }
 
 /* determines if following bits are rtsb_trailing_bits */
-static inline int rbsp_trailing_bits(uint8_t *buf, int buf_len)
+static inline int rbsp_trailing_bits(const uint8_t *buf, int buf_len)
 {
-  uint8_t *cur_buf = buf+(buf_len-1);
+  const uint8_t *cur_buf = buf+(buf_len-1);
   uint8_t cur_val;
   int parsed_bits = 0;
   int i;
@@ -1600,7 +1600,7 @@ void free_parser(struct h264_parser *parser)
   free(parser);
 }
 
-void parse_codec_private(struct h264_parser *parser, uint8_t *inbuf, int inbuf_len)
+void parse_codec_private(struct h264_parser *parser, const uint8_t *inbuf, int inbuf_len)
 {
   struct buf_reader bufr;
 
@@ -1807,7 +1807,7 @@ int parse_frame(struct h264_parser *parser, uint8_t *inbuf, int inbuf_len,
  *         1: NAL is the beginning of a new coded picture
  *         3: NAL is marked as END_OF_SEQUENCE
  */
-int parse_nal(uint8_t *buf, int buf_len, struct h264_parser *parser,
+int parse_nal(const uint8_t *buf, int buf_len, struct h264_parser *parser,
     struct coded_picture **completed_picture)
 {
   int ret = 0;
diff --git a/src/video_dec/libvdpau/h264_parser.h b/src/video_dec/libvdpau/h264_parser.h
index 49bc56bab..9ed78c7e7 100644
--- a/src/video_dec/libvdpau/h264_parser.h
+++ b/src/video_dec/libvdpau/h264_parser.h
@@ -88,7 +88,7 @@ struct h264_parser {
     xine_t *xine;
 };
 
-int parse_nal(uint8_t *buf, int buf_len, struct h264_parser *parser,
+int parse_nal(const uint8_t *buf, int buf_len, struct h264_parser *parser,
     struct coded_picture **completed_picture);
 
 int seek_for_nal(uint8_t *buf, int buf_len, struct h264_parser *parser);
@@ -105,6 +105,6 @@ int parse_frame(struct h264_parser *parser, uint8_t *inbuf, int inbuf_len,
  */
 void process_mmc_operations(struct h264_parser *parser, struct coded_picture *picture);
 
-void parse_codec_private(struct h264_parser *parser, uint8_t *inbuf, int inbuf_len);
+void parse_codec_private(struct h264_parser *parser, const uint8_t *inbuf, int inbuf_len);
 
 #endif
diff --git a/src/video_dec/libvdpau/vdpau_h264.c b/src/video_dec/libvdpau/vdpau_h264.c
index 4ac54ad45..b7a8ea036 100644
--- a/src/video_dec/libvdpau/vdpau_h264.c
+++ b/src/video_dec/libvdpau/vdpau_h264.c
@@ -717,7 +717,7 @@ static void vdpau_h264_decode_data (video_decoder_t *this_gen,
     this->have_frame_boundary_marks = 0;
 
     if(buf->decoder_info[1] == BUF_SPECIAL_DECODER_CONFIG) {
-      uint8_t *codec_private = buf->decoder_info_ptr[2];
+      const uint8_t *codec_private = buf->decoder_info_ptr[2];
       uint32_t codec_private_len = buf->decoder_info[2];
       this->codec_private_len = codec_private_len;
       this->codec_private = malloc(codec_private_len);