From d099d82407531daf75c3f36cbb14758d2af7cdfe Mon Sep 17 00:00:00 2001
From: Torsten Jager <t.jager@gmx.de>
Date: Sat, 19 Apr 2014 14:47:25 +0200
Subject: DXR3: silence warnings.

---
 src/dxr3/compat.c         |  4 ++--
 src/dxr3/video_out_dxr3.c | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/dxr3/compat.c b/src/dxr3/compat.c
index a4722f923..cbb1f3fb5 100644
--- a/src/dxr3/compat.c
+++ b/src/dxr3/compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 the xine project
+ * Copyright (C) 2010-2014 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -22,7 +22,7 @@
 int dxr3_compat_ioctl (int fd, int rq, void *arg)
 {
   int ret = ioctl (fd, rq, arg);
-  if (ret < 0 && errno == EINVAL || errno == ENOTTY)
+  if (ret < 0 && (errno == EINVAL || errno == ENOTTY))
     ret = ioctl (fd, rq & 0xFF, arg);
   return ret;
 }
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 8b9b9ae36..36af82ce9 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2011 the xine project
+ * Copyright (C) 2000-2014 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -213,8 +213,8 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
   char tmpstr[100];
   const char *confstr;
   int encoder, confnum;
-  static char *available_encoders[SUPPORTED_ENCODER_COUNT + 2];
-  plugin_node_t *node;
+  static const char *available_encoders[SUPPORTED_ENCODER_COUNT + 2];
+  plugin_node_t *node = NULL; /* unused inside dxr3_lavc_init () anyway... */
 
   static const char *const videoout_modes[] = {
     "letterboxed tv", "widescreen tv",
@@ -224,9 +224,10 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
     NULL
   };
   static const char *const tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL };
+  /*
   int list_id, list_size;
   xine_sarray_t *plugin_list;
-
+  */
   if (class->instance) return NULL;
 
   this = calloc(1, sizeof(dxr3_driver_t));
@@ -315,7 +316,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
 #endif
   if (encoder) {
     encoder = config->register_enum(config, "dxr3.encoding.encoder", 0,
-      available_encoders, _("encoder for non mpeg content"),
+      (char **) available_encoders, _("encoder for non mpeg content"),
       _("Content other than MPEG has to pass an additional reencoding stage, "
 	"because the dxr3 handles only MPEG.\nDepending on what is supported by your xine, "
 	"this setting can be \"fame\", \"rte\", \"libavcodec\" or \"none\".\n"
@@ -1286,7 +1287,7 @@ static void gather_screen_vars(dxr3_driver_t *this, const x11_visual_t *vis)
 #define TYPE_FLOAT 4
 
 struct lut_entry {
-    char *name;
+    const char *name;
     int type;
     void *ptr;
 };
-- 
cgit v1.2.3