From 6178651425a096663125813823c5a170086d99ac Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Thu, 26 Sep 2013 21:25:08 +0300
Subject: Added const

---
 src/video_dec/libvdpau/alterh264_bits_reader.h |  6 +++---
 src/video_dec/libvdpau/alterh264_decode.c      |  6 +++---
 src/video_dec/libvdpau/bits_reader.h           |  6 +++---
 src/video_dec/libvdpau/h264_parser.c           | 12 ++++++------
 src/video_dec/libvdpau/h264_parser.h           |  4 ++--
 src/video_dec/libvdpau/vdpau_h264.c            |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src')

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);
-- 
cgit v1.2.3


From 4a9796be937e0a0ac4811698d04e1dd938b1908e Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Thu, 26 Sep 2013 21:26:35 +0300
Subject: Silenced warnings

---
 src/vdr/input_vdr.c | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c
index 2bf74ead3..cd1e869ca 100644
--- a/src/vdr/input_vdr.c
+++ b/src/vdr/input_vdr.c
@@ -498,9 +498,9 @@ static off_t vdr_execute_rpc_command(vdr_input_plugin_t *this)
 
   case func_osd_flush:
     {
-      double _t1, _t2;
+      double _t1/*, _t2*/;
       int _n = 0;
-      int _to = 0;
+      /*int _to = 0;*/
       int r = 0;
 
       READ_DATA_OR_FAIL(osd_flush, LOG_OSD(lprintf("got OSDFLUSH\n")));
@@ -514,7 +514,7 @@ static off_t vdr_execute_rpc_command(vdr_input_plugin_t *this)
 break;
         if ((_now() - _t1) > 200)
         {
-          _to = 1;
+          /*_to = 1;*/
           break;
         }
 /*
@@ -524,9 +524,9 @@ break;
         xine_usec_sleep(5000);
         _n++;
       }
-
-      _t2 = _now();
 /*
+      _t2 = _now();
+
       fprintf(stderr, "vdr: osdflush: n: %d, %.1lf, timeout: %d, result: %d\n", _n, _t2 - _t1, _to, r);
 */
 /*
@@ -883,7 +883,7 @@ break;
       }
 
       {
-        double _t1, _t2;
+        /*double _t1, _t2*/;
         int _n = 0;
 
         int vb = -1, ab = -1, vf = -1, af = -1;
@@ -912,7 +912,7 @@ break;
           then.tv_sec  = 0;
         }
 
-        _t1 = _now();
+        /*_t1 = _now();*/
 
         while (1)
         {
@@ -936,7 +936,7 @@ break;
             gettimeofday(&now, 0);
         }
 
-        _t2 = _now();
+        /*_t2 = _now();*/
         /* fprintf(stderr, "vdr: flush: n: %d, %.1lf\n", _n, _t2 - _t1); */
 
         xprintf(this->stream->xine
@@ -972,9 +972,9 @@ break;
 
   case func_set_volume:
     {
-double t3, t2, t1, t0;
+/*double t3, t2, t1, t0;*/
       READ_DATA_OR_FAIL(set_volume, lprintf("got SETVOLUME\n"));
-t0 = _now();
+/*t0 = _now();*/
       {
         int change_volume = (this->volume_mode != XINE_VDR_VOLUME_IGNORE);
         int do_mute   = (this->last_volume != 0 && 0 == data->volume);
@@ -1007,14 +1007,14 @@ t0 = _now();
             return -1;
           };
         }
-t1 = _now();
+/*t1 = _now();*/
 
         if (change_volume)
         {
           report_change = 1;
           xine_set_param(this->stream, param_volume, this->last_volume);
         }
-t2 = _now();
+/*t2 = _now();*/
 
         if (report_change && this->volume_mode != XINE_VDR_VOLUME_CHANGE_SW)
         {
@@ -1026,7 +1026,7 @@ t2 = _now();
             = xine_get_param(this->stream, param_volume);
           data.mute
             = xine_get_param(this->stream, param_mute);
-t3 = _now();
+/*t3 = _now();*/
 
           event.type        = XINE_EVENT_AUDIO_LEVEL;
           event.data        = &data;
@@ -1315,7 +1315,7 @@ fprintf(stderr, "C =============================================\n");
 
   case func_reset_audio:
     {
-      double _t1, _t2;
+      /*double _t1, _t2;*/
       int _n = 0;
 
       READ_DATA_OR_FAIL(reset_audio, lprintf("got RESET AUDIO\n"));
@@ -1325,7 +1325,7 @@ fprintf(stderr, "C =============================================\n");
         xine_set_param(this->stream, XINE_PARAM_IGNORE_AUDIO, 1);
         xine_set_param(this->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, -2);
 
-        _t1 = _now();
+        /*_t1 = _now();*/
 
         while (1)
         {
@@ -1353,7 +1353,7 @@ fprintf(stderr, "C =============================================\n");
           _n++;
         }
 
-        _t2 = _now();
+        /*_t2 = _now();*/
         /* fprintf(stderr, "vdr: reset_audio: n: %d, %.1lf\n", _n, _t2 - _t1); */
 
         xine_set_param(this->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, -1);
@@ -1953,7 +1953,12 @@ static int vdr_plugin_open_fifo_mrl(input_plugin_t *this_gen)
   /* eat initial handshake byte */
   {
     char b;
-    read(this->fh, &b, 1);
+    if (1 != read(this->fh, &b, 1)) {
+      xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+	      _("%s: failed to read '%s' (%s)\n"), LOG_MODULE,
+	      filename,
+	      strerror(errno));
+    }
   }
 
   {
-- 
cgit v1.2.3


From d0f61081e46bdcb0b00c838913bbb081f65bd211 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Thu, 26 Sep 2013 21:36:27 +0300
Subject: demux_nsv: removed extra input->get_current_pos() call (was
 duplicated when the function was splitted in 2004 ...)

---
 src/demuxers/demux_nsv.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src')

diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index bb775722e..ca8f5794e 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -458,13 +458,10 @@ static int demux_nsv_send_chunk(demux_plugin_t *this_gen) {
   demux_nsv_t *this = (demux_nsv_t *) this_gen;
 
   uint8_t  buffer[15];
-  off_t    current_file_pos;
   int      video_size;
   int      audio_size;
   int      chunk_type;
 
-  current_file_pos = this->input->get_current_pos(this->input);
-
   lprintf("dispatching video & audio chunks...\n");
 
   if (this->is_first_chunk) {
-- 
cgit v1.2.3


From 16480d41287ac90bbaa53fb4f1bec0fceca85088 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 27 Sep 2013 09:59:20 +0300
Subject: Silenced warnings

---
 src/demuxers/demux_qt.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 4fc7f8a38..44b4dd8b8 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -699,13 +699,12 @@ static int is_qt_file(input_plugin_t *qt_file) {
   off_t moov_atom_offset = -1;
   int64_t moov_atom_size = -1;
   int i;
-  int len;
 
   /* if the input is non-seekable, be much more stringent about qualifying
    * a QT file: In this case, the moov must be the first atom in the file */
   if ((qt_file->get_capabilities(qt_file) & INPUT_CAP_SEEKABLE) == 0) {
     unsigned char preview[MAX_PREVIEW_SIZE] = { 0, };
-    len = qt_file->get_optional_data(qt_file, preview, INPUT_OPTIONAL_DATA_PREVIEW);
+    qt_file->get_optional_data(qt_file, preview, INPUT_OPTIONAL_DATA_PREVIEW);
     if (_X_BE_32(&preview[4]) == MOOV_ATOM)
       return 1;
     else {
@@ -798,7 +797,7 @@ static void parse_meta_atom(qt_info *info, unsigned char *meta_atom) {
     const uint8_t *const current_atom = &meta_atom[i];
     const qt_atom current_atom_code = _X_BE_32(&current_atom[4]);
     const uint32_t current_atom_size = _X_BE_32(&current_atom[0]);
-    uint32_t handler_type = 0;
+    /*uint32_t handler_type = 0;*/
 
     switch (current_atom_code) {
     case HDLR_ATOM: {
@@ -813,7 +812,7 @@ static void parse_meta_atom(qt_info *info, unsigned char *meta_atom) {
 	return;
       }
 
-      handler_type = _X_BE_32(&current_atom[12]);
+      /*handler_type = _X_BE_32(&current_atom[12]);*/
     }
       break;
 
-- 
cgit v1.2.3


From 03081c43eea7914dd9008f6042abcb06ee76a1fe Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 27 Sep 2013 10:01:31 +0300
Subject: Added const

---
 src/spu_dec/sputext_decoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/spu_dec/sputext_decoder.c b/src/spu_dec/sputext_decoder.c
index 5db52b9d6..8421d8871 100644
--- a/src/spu_dec/sputext_decoder.c
+++ b/src/spu_dec/sputext_decoder.c
@@ -155,7 +155,7 @@ typedef struct sputext_decoder_s {
   subtitle_size      subtitle_size;   /* size of subtitles */
   int                vertical_offset;
   char               font[FILENAME_MAX]; /* subtitle font */
-  char              *buf_encoding;    /* encoding of subtitle buffer */
+  const char         *buf_encoding;    /* encoding of subtitle buffer */
 
   int                width;          /* frame width                */
   int                height;         /* frame height               */
-- 
cgit v1.2.3


From e7c4f198d4f79cc354c4900d40582bb11d4b96f7 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 27 Sep 2013 10:31:15 +0300
Subject: Hide warnings

---
 src/spu_dec/spudvb_decoder.c  | 59 ++++++++++++++++++++++---------------------
 src/spu_dec/sputext_demuxer.c |  2 ++
 2 files changed, 32 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/spu_dec/spudvb_decoder.c b/src/spu_dec/spudvb_decoder.c
index 0132df202..dd42e7823 100644
--- a/src/spu_dec/spudvb_decoder.c
+++ b/src/spu_dec/spudvb_decoder.c
@@ -498,15 +498,15 @@ static void set_clut(dvb_spu_decoder_t *this,int CLUT_id,int CLUT_entry_id,int Y
 }
 
 static void process_CLUT_definition_segment(dvb_spu_decoder_t *this) {
-  int page_id,
+  int /*page_id,*/
       segment_length,
-      CLUT_id,
-      CLUT_version_number;
+      CLUT_id/*,
+      CLUT_version_number*/;
 
   int CLUT_entry_id,
-      CLUT_flag_8_bit,
-      CLUT_flag_4_bit,
-      CLUT_flag_2_bit,
+      /*CLUT_flag_8_bit,*/
+      /*CLUT_flag_4_bit,*/
+      /*CLUT_flag_2_bit,*/
       full_range_flag,
       Y_value,
       Cr_value,
@@ -516,20 +516,20 @@ static void process_CLUT_definition_segment(dvb_spu_decoder_t *this) {
 
   int j;
 
-  page_id=(dvbsub->buf[dvbsub->i]<<8)|dvbsub->buf[dvbsub->i+1]; dvbsub->i+=2;
+  /*page_id=(dvbsub->buf[dvbsub->i]<<8)|dvbsub->buf[dvbsub->i+1];*/ dvbsub->i+=2;
   segment_length=(dvbsub->buf[dvbsub->i]<<8)|dvbsub->buf[dvbsub->i+1]; dvbsub->i+=2;
   j=dvbsub->i+segment_length;
 
   CLUT_id=dvbsub->buf[dvbsub->i++];
-  CLUT_version_number=(dvbsub->buf[dvbsub->i]&0xf0)>>4;
+  /*CLUT_version_number=(dvbsub->buf[dvbsub->i]&0xf0)>>4;*/
   dvbsub->i++;
 
   while (dvbsub->i < j) {
     CLUT_entry_id=dvbsub->buf[dvbsub->i++];
 
-    CLUT_flag_2_bit=(dvbsub->buf[dvbsub->i]&0x80)>>7;
-    CLUT_flag_4_bit=(dvbsub->buf[dvbsub->i]&0x40)>>6;
-    CLUT_flag_8_bit=(dvbsub->buf[dvbsub->i]&0x20)>>5;
+    /*CLUT_flag_2_bit=(dvbsub->buf[dvbsub->i]&0x80)>>7;*/
+    /*CLUT_flag_4_bit=(dvbsub->buf[dvbsub->i]&0x40)>>6;*/
+    /*CLUT_flag_8_bit=(dvbsub->buf[dvbsub->i]&0x20)>>5;*/
     full_range_flag=dvbsub->buf[dvbsub->i]&1;
     dvbsub->i++;
 
@@ -653,8 +653,9 @@ static void process_region_composition_segment (dvb_spu_decoder_t * this)
   int segment_length,
     region_id,
     region_version_number,
-    region_fill_flag, region_width, region_height, region_level_of_compatibility, region_depth, CLUT_id, region_8_bit_pixel_code, region_4_bit_pixel_code, region_2_bit_pixel_code;
-  int object_id, object_type, object_provider_flag, object_x, object_y, foreground_pixel_code, background_pixel_code;
+    region_fill_flag, region_width, region_height, region_level_of_compatibility, region_depth, CLUT_id,
+    /*region_8_bit_pixel_code,*/ region_4_bit_pixel_code /*, region_2_bit_pixel_code*/;
+  int object_id, object_type, /*object_provider_flag,*/ object_x, object_y /*, foreground_pixel_code, background_pixel_code*/;
   int j;
   int o;
   dvbsub_func_t *dvbsub = this->dvbsub;
@@ -678,9 +679,9 @@ static void process_region_composition_segment (dvb_spu_decoder_t * this)
   dvbsub->compat_depth = region_level_of_compatibility << 3 | region_depth;
   dvbsub->i++;
   CLUT_id = dvbsub->buf[dvbsub->i++];
-  region_8_bit_pixel_code = dvbsub->buf[dvbsub->i++];
+  /*region_8_bit_pixel_code = dvbsub->buf[*/dvbsub->i++/*]*/;
   region_4_bit_pixel_code = (dvbsub->buf[dvbsub->i] & 0xf0) >> 4;
-  region_2_bit_pixel_code = (dvbsub->buf[dvbsub->i] & 0x0c) >> 2;
+  /*region_2_bit_pixel_code = (dvbsub->buf[dvbsub->i] & 0x0c) >> 2;*/
   dvbsub->i++;
 
   if(region_id>=MAX_REGIONS)
@@ -707,7 +708,7 @@ static void process_region_composition_segment (dvb_spu_decoder_t * this)
     object_id = (dvbsub->buf[dvbsub->i] << 8) | dvbsub->buf[dvbsub->i + 1];
     dvbsub->i += 2;
     object_type = (dvbsub->buf[dvbsub->i] & 0xc0) >> 6;
-    object_provider_flag = (dvbsub->buf[dvbsub->i] & 0x30) >> 4;
+    /*object_provider_flag = (dvbsub->buf[dvbsub->i] & 0x30) >> 4;*/
     object_x = ((dvbsub->buf[dvbsub->i] & 0x0f) << 8) | dvbsub->buf[dvbsub->i + 1];
     dvbsub->i += 2;
     object_y = ((dvbsub->buf[dvbsub->i] & 0x0f) << 8) | dvbsub->buf[dvbsub->i + 1];
@@ -716,8 +717,8 @@ static void process_region_composition_segment (dvb_spu_decoder_t * this)
     dvbsub->regions[region_id].object_pos[object_id] = (object_x << 16) | object_y;
 
     if ((object_type == 0x01) || (object_type == 0x02)) {
-      foreground_pixel_code = dvbsub->buf[dvbsub->i++];
-      background_pixel_code = dvbsub->buf[dvbsub->i++];
+      /*foreground_pixel_code = dvbsub->buf[*/dvbsub->i++/*]*/;
+      /*background_pixel_code = dvbsub->buf[*/dvbsub->i++/*]*/;
     }
   }
 
@@ -725,7 +726,7 @@ static void process_region_composition_segment (dvb_spu_decoder_t * this)
 
 static void process_object_data_segment (dvb_spu_decoder_t * this)
 {
-  int segment_length, object_id, object_version_number, object_coding_method, non_modifying_colour_flag;
+  int /*segment_length,*/ object_id/*, object_version_number*/, object_coding_method/*, non_modifying_colour_flag*/;
 
   int top_field_data_block_length, bottom_field_data_block_length;
 
@@ -736,15 +737,15 @@ static void process_object_data_segment (dvb_spu_decoder_t * this)
 
   dvbsub->page.page_id = (dvbsub->buf[dvbsub->i] << 8) | dvbsub->buf[dvbsub->i + 1];
   dvbsub->i += 2;
-  segment_length = (dvbsub->buf[dvbsub->i] << 8) | dvbsub->buf[dvbsub->i + 1];
+  /*segment_length = (dvbsub->buf[dvbsub->i] << 8) | dvbsub->buf[dvbsub->i + 1];*/
   dvbsub->i += 2;
 
   object_id = (dvbsub->buf[dvbsub->i] << 8) | dvbsub->buf[dvbsub->i + 1];
   dvbsub->i += 2;
   dvbsub->curr_obj = object_id;
-  object_version_number = (dvbsub->buf[dvbsub->i] & 0xf0) >> 4;
+  /*object_version_number = (dvbsub->buf[dvbsub->i] & 0xf0) >> 4;*/
   object_coding_method = (dvbsub->buf[dvbsub->i] & 0x0c) >> 2;
-  non_modifying_colour_flag = (dvbsub->buf[dvbsub->i] & 0x02) >> 1;
+  /*non_modifying_colour_flag = (dvbsub->buf[dvbsub->i] & 0x02) >> 1;*/
   dvbsub->i++;
 
   old_i = dvbsub->i;
@@ -922,11 +923,11 @@ static void draw_subtitles (dvb_spu_decoder_t * this)
 static void spudec_decode_data (spu_decoder_t * this_gen, buf_element_t * buf)
 {
   dvb_spu_decoder_t *this = (dvb_spu_decoder_t *) this_gen;
-      int new_i;
-      int data_identifier, subtitle_stream_id;
-      int segment_length, segment_type;
-      int PES_packet_length;
-      int i;
+  int new_i;
+  /*int data_identifier, subtitle_stream_id;*/
+  int segment_length, segment_type;
+  int PES_packet_length;
+  int i;
 
   if((buf->type & 0xffff0000)!=BUF_SPU_DVB)
     return;
@@ -996,8 +997,8 @@ static void spudec_decode_data (spu_decoder_t * this_gen, buf_element_t * buf)
 
       this->dvbsub->i = 0;
 
-      data_identifier = this->dvbsub->buf[this->dvbsub->i++];
-      subtitle_stream_id = this->dvbsub->buf[this->dvbsub->i++];
+      /*data_identifier = this->dvbsub->buf[*/this->dvbsub->i++/*]*/;
+      /*subtitle_stream_id = this->dvbsub->buf[*/this->dvbsub->i++/*]*/;
 
       while (this->dvbsub->i <= (PES_packet_length)) {
 	/* SUBTITLING SEGMENT */
diff --git a/src/spu_dec/sputext_demuxer.c b/src/spu_dec/sputext_demuxer.c
index 7b4cd9531..005178cd4 100644
--- a/src/spu_dec/sputext_demuxer.c
+++ b/src/spu_dec/sputext_demuxer.c
@@ -104,6 +104,8 @@ typedef struct demux_sputext_class_s {
 
 } demux_sputext_class_t;
 
+void *init_sputext_demux_class (xine_t *xine, void *data);
+
 /*
  * Demuxer code start
  */
-- 
cgit v1.2.3


From 6bf607b588972aaff055c633010bb370ad9f7489 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 27 Sep 2013 10:45:30 +0300
Subject: Added const

---
 src/xine-engine/broadcaster.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c
index 24bf5a91b..af63435e8 100644
--- a/src/xine-engine/broadcaster.c
+++ b/src/xine-engine/broadcaster.c
@@ -113,10 +113,10 @@ static int sock_check_opened(int socket) {
 /*
  * Write to socket.
  */
-static int sock_data_write(xine_t *xine, int socket, void *buf_gen, int len) {
+static int sock_data_write(xine_t *xine, int socket, const void *buf_gen, int len) {
   ssize_t  size;
   int      wlen = 0;
-  uint8_t *buf = buf_gen;
+  const uint8_t *buf = buf_gen;
 
   if((socket < 0) || (buf == NULL))
     return -1;
@@ -160,7 +160,7 @@ sock_string_write(xine_t *xine, int socket, const char *msg, ...) {
  * this is the most important broadcaster function.
  * it sends data to every connected client (slaves).
  */
-static void broadcaster_data_write(broadcaster_t *this, void *buf, int len) {
+static void broadcaster_data_write(broadcaster_t *this, const void *buf, int len) {
   xine_list_iterator_t ite;
 
   ite = xine_list_front (this->connections);
-- 
cgit v1.2.3


From f0073dc323d7f390b184e57e2434acb26d2baed4 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 27 Sep 2013 10:47:38 +0300
Subject: Hide warnings

---
 src/audio_dec/xine_a52_decoder.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c
index ab7e57231..cf631f4ab 100644
--- a/src/audio_dec/xine_a52_decoder.c
+++ b/src/audio_dec/xine_a52_decoder.c
@@ -381,16 +381,16 @@ static void a52dec_decode_frame (a52dec_decoder_t *this, int64_t pts, int previe
       /* SPDIF Passthrough
        * Build SPDIF Header and encaps the A52 audio data in it.
        */
-      uint32_t syncword, crc1, fscod,frmsizecod,bsid,bsmod,frame_size;
+      uint32_t /*syncword, crc1,*/ fscod,frmsizecod,/*bsid,*/bsmod,frame_size;
       uint8_t *data_out,*data_in;
       audio_buffer_t *buf = this->stream->audio_out->get_buffer (this->stream->audio_out);
       data_in=(uint8_t *) this->frame_buffer;
       data_out=(uint8_t *) buf->mem;
-      syncword = data_in[0] | (data_in[1] << 8);
-      crc1 = data_in[2] | (data_in[3] << 8);
+      /*syncword = data_in[0] | (data_in[1] << 8);*/
+      /*crc1 = data_in[2] | (data_in[3] << 8);*/
       fscod = (data_in[4] >> 6) & 0x3;
       frmsizecod = data_in[4] & 0x3f;
-      bsid = (data_in[5] >> 3) & 0x1f;
+      /*bsid = (data_in[5] >> 3) & 0x1f;*/
       bsmod = data_in[5] & 0x7;		/* bsmod, stream = 0 */
       frame_size = frmsizecod_tbl[frmsizecod].frm_size[fscod] ;
 
-- 
cgit v1.2.3


From f2b418de81852f91976f9972352995f47b69b579 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 27 Sep 2013 10:50:42 +0300
Subject: Hide warning

---
 src/input/libreal/real.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c
index d5320abed..73f1ec3b3 100644
--- a/src/input/libreal/real.c
+++ b/src/input/libreal/real.c
@@ -538,7 +538,9 @@ int real_get_rdt_chunk(rtsp_t *rtsp_session, unsigned char **buffer) {
   rmff_pheader_t ph;
   int size;
   int flags1;
+#ifdef LOG
   int unknown1;
+#endif
   uint32_t ts;
 
   n=rtsp_read_data(rtsp_session, header, 8);
@@ -572,7 +574,9 @@ int real_get_rdt_chunk(rtsp_t *rtsp_session, unsigned char **buffer) {
     flags1=header[4];
     size-=9;
   }
+#ifdef LOG
   unknown1=(header[5]<<16)+(header[6]<<8)+(header[7]);
+#endif
   n=rtsp_read_data(rtsp_session, header, 6);
   if (n<6) return 0;
   ts=_X_BE_32(header);
-- 
cgit v1.2.3


From 95770a9a7ae3f80c0895e40c135dc9ac36197a5d Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 27 Sep 2013 10:50:50 +0300
Subject: Added const

---
 src/input/libreal/asmrp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/input/libreal/asmrp.c b/src/input/libreal/asmrp.c
index 45730eb90..df4f37774 100644
--- a/src/input/libreal/asmrp.c
+++ b/src/input/libreal/asmrp.c
@@ -362,7 +362,7 @@ static void asmrp_get_sym (asmrp_t *p) {
 
 }
 
-static int asmrp_find_id (asmrp_t *p, char *s) {
+static int asmrp_find_id (asmrp_t *p, const char *s) {
 
   int i;
 
@@ -374,7 +374,7 @@ static int asmrp_find_id (asmrp_t *p, char *s) {
   return -1;
 }
 
-static int asmrp_set_id (asmrp_t *p, char *s, int v) {
+static int asmrp_set_id (asmrp_t *p, const char *s, int v) {
 
   int i;
 
-- 
cgit v1.2.3


From eac1d5e9fe8f295d863146c38646c4cdc8199a03 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 27 Sep 2013 10:57:40 +0300
Subject: vaapi: fix yuy2_to_nv12

---
 src/video_out/video_out_vaapi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/video_out/video_out_vaapi.c b/src/video_out/video_out_vaapi.c
index 6f0b5c1b8..a9025f4b6 100644
--- a/src/video_out/video_out_vaapi.c
+++ b/src/video_out/video_out_vaapi.c
@@ -3071,8 +3071,8 @@ static void yuy2_to_nv12(const uint8_t *src_yuy2_map, int yuy2_pitch,
   uint8_t *uv_dst_tmp = uv_dst;
   for(y = 0; y < height; y++) {
     for(x = 0; x < width; x++) {
-      *(uv_dst_tmp + (height*width/4) ) = (yuy2_map + (height*width/2));
-      *(uv_dst_tmp + (height*width/4) + 2 ) = (yuy2_map + (height*width/2) + 2);
+      *(uv_dst_tmp + (height*width/4) ) = *(yuy2_map + (height*width/2));
+      *(uv_dst_tmp + (height*width/4) + 2 ) = *(yuy2_map + (height*width/2) + 2);
     }
     uv_dst += uv_dst_pitch / 2;
     yuy2_map += yuy2_pitch;
-- 
cgit v1.2.3


From 25ab949a5454355c1dbd6de7e5373af714acaeb7 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 27 Sep 2013 10:59:19 +0300
Subject: Silence warning

---
 src/video_out/video_out_vaapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/video_out/video_out_vaapi.c b/src/video_out/video_out_vaapi.c
index a9025f4b6..6aaf94554 100644
--- a/src/video_out/video_out_vaapi.c
+++ b/src/video_out/video_out_vaapi.c
@@ -3051,7 +3051,7 @@ static void yuy2_to_nv12(const uint8_t *src_yuy2_map, int yuy2_pitch,
   int width   = (src_width > dst_width) ? dst_width : src_width;
 
   int y, x;
-  int uv_dst_size = dst_height * uv_dst_pitch / 2;
+  /*int uv_dst_size = dst_height * uv_dst_pitch / 2;*/
 
   const uint8_t *yuy2_map = src_yuy2_map;
   for(y = 0; y < height; y++) {
-- 
cgit v1.2.3


From 4162fe03c487c3867abcfcb755144a5ad678e9c3 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 27 Sep 2013 11:06:14 +0300
Subject: Added const

---
 src/xine-engine/alphablend.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c
index db43fd53a..6e7191ed2 100644
--- a/src/xine-engine/alphablend.c
+++ b/src/xine-engine/alphablend.c
@@ -1923,7 +1923,7 @@ void _x_dispose_xx44_palette(xx44_palette_t *p)
 }
 
 static void colorToPalette(const uint32_t *icolor, unsigned char *palette_p,
-			   unsigned num_xvmc_components, char *xvmc_components)
+			   unsigned num_xvmc_components, const char *xvmc_components)
 {
   const clut_t *color = (const clut_t *) icolor;
   unsigned int i;
@@ -1941,7 +1941,7 @@ static void colorToPalette(const uint32_t *icolor, unsigned char *palette_p,
 
 void _x_xx44_to_xvmc_palette(const xx44_palette_t *p,unsigned char *xvmc_palette,
 			  unsigned first_xx44_entry, unsigned num_xx44_entries,
-			  unsigned num_xvmc_components, char *xvmc_components)
+			  unsigned num_xvmc_components, const char *xvmc_components)
 {
   register unsigned int i;
   register const uint32_t *cluts = p->cluts + first_xx44_entry;
-- 
cgit v1.2.3


From f6e912f53d03e11beaf324468fac2b6f3cfb43bf Mon Sep 17 00:00:00 2001
From: Torsten Jager <t.jager@gmx.de>
Date: Fri, 27 Sep 2013 15:52:28 +0200
Subject: demux_qt: simple (E)AC3 support. Works at least with dvb stuff.

---
 src/demuxers/demux_qt.c        | 10 ++++++++++
 src/xine-engine/buffer_types.c |  1 +
 2 files changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 44b4dd8b8..41b5c5b5b 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -108,6 +108,8 @@ typedef unsigned int qt_atom;
 #define IN24_FOURCC ME_FOURCC('i', 'n', '2', '4')
 #define NI42_FOURCC ME_FOURCC('4', '2', 'n', 'i')
 #define AVC1_FOURCC ME_FOURCC('a', 'v', 'c', '1')
+#define AC_3_FOURCC ME_FOURCC('a', 'c', '-', '3')
+#define EAC3_FOURCC ME_FOURCC('e', 'c', '-', '3')
 
 #define UDTA_ATOM QT_ATOM('u', 'd', 't', 'a')
 #define META_ATOM QT_ATOM('m', 'e', 't', 'a')
@@ -1283,6 +1285,8 @@ static qt_error parse_trak_atom (qt_trak *trak,
            * further, do not do load these parameters if the audio is just
            * PCM ('raw ', 'twos', 'sowt' or 'in24') */
           if ((current_stsd_atom_size > 0x24) &&
+              (trak->stsd_atoms[k].audio.codec_fourcc != AC_3_FOURCC) &&
+              (trak->stsd_atoms[k].audio.codec_fourcc != EAC3_FOURCC) &&
               (trak->stsd_atoms[k].audio.codec_fourcc != TWOS_FOURCC) &&
               (trak->stsd_atoms[k].audio.codec_fourcc != SOWT_FOURCC) &&
               (trak->stsd_atoms[k].audio.codec_fourcc != RAW_FOURCC)  &&
@@ -1321,6 +1325,12 @@ static qt_error parse_trak_atom (qt_trak *trak,
           if (trak->stsd_atoms[k].audio.codec_fourcc == SAMR_FOURCC)
             trak->stsd_atoms[k].audio.vbr = 1;
 
+          if (trak->stsd_atoms[k].audio.codec_fourcc == AC_3_FOURCC)
+            trak->stsd_atoms[k].audio.vbr = 1;
+
+          if (trak->stsd_atoms[k].audio.codec_fourcc == EAC3_FOURCC)
+            trak->stsd_atoms[k].audio.vbr = 1;
+
           if (trak->stsd_atoms[k].audio.codec_fourcc == ALAC_FOURCC) {
             trak->stsd_atoms[k].audio.vbr = 1;
             /* further, FFmpeg's ALAC decoder requires 36 out-of-band bytes */
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index edc0957ce..52777db91 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -808,6 +808,7 @@ static const audio_db_t audio_db[] = {
   {
     0x2000,
     ME_FOURCC('m', 's', 0x20, 0x00),
+    ME_FOURCC('a', 'c', '-', '3'),
     0
   },
   BUF_AUDIO_A52,
-- 
cgit v1.2.3


From 86b02c35c856d53ac870203447387b1c5074dbb2 Mon Sep 17 00:00:00 2001
From: Torsten Jager <t.jager@gmx.de>
Date: Fri, 27 Sep 2013 15:52:29 +0200
Subject: yuv2rgb_mmx: fix swapped modes. This bug probably never hit anyway.
 Nobody uses 24bpp X displays, as they are way slower than 32 bit ones, or
 even unsupported by hw.

---
 src/video_out/yuv2rgb_mmx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c
index 7279d1528..93b0ff1bf 100644
--- a/src/video_out/yuv2rgb_mmx.c
+++ b/src/video_out/yuv2rgb_mmx.c
@@ -1309,12 +1309,12 @@ void yuv2rgb_init_mmx (yuv2rgb_factory_t *this) {
   if (this->swapped) switch (this->mode) {
   case MODE_24_RGB:
     this->yuv2rgb_fun = mmx_bgr24;
-    break;
+    return;
   case MODE_24_BGR:
     this->yuv2rgb_fun = mmx_rgb24;
-    break;
+    return;
   default:
-    return; /* other swapped formats not yet */
+    return; /* other swapped formats yet unsupported */
   }
 
   switch (this->mode) {
-- 
cgit v1.2.3


From 1484cd98330543db0f70955cb8877aeab7f8f06f Mon Sep 17 00:00:00 2001
From: Torsten Jager <t.jager@gmx.de>
Date: Fri, 27 Sep 2013 15:52:30 +0200
Subject: color_matrix.c: default to "Signal+Size". This is preferred on any
 half-way sRGB compliant monitors.

---
 src/video_out/color_matrix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/video_out/color_matrix.c b/src/video_out/color_matrix.c
index f807a0e92..32fe3f61c 100644
--- a/src/video_out/color_matrix.c
+++ b/src/video_out/color_matrix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 the xine project
+ * Copyright (C) 2012-2013 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -117,7 +117,7 @@ static void cm_init (CM_DRIVER_T *this) {
   this->cm_state = this->xine->config->register_enum (
     this->xine->config,
     CM_CONFIG_NAME,
-    CM_CONFIG_SD,
+    CM_CONFIG_SIZE,
     (char **)cm_conf_labels,
     _("Output color matrix"),
     _("Tell how output colors should be calculated.\n\n"
-- 
cgit v1.2.3