summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/demuxers/demux_real.c2
-rw-r--r--src/post/audio/stretch.c2
-rw-r--r--src/post/audio/upmix_mono.c2
-rw-r--r--src/post/deinterlace/xine_plugin.c3
-rw-r--r--src/spu_dec/spudvb_decoder.c1
-rw-r--r--src/video_out/video_out_opengl.c8
-rw-r--r--src/video_out/video_out_xcbshm.c2
-rw-r--r--src/video_out/video_out_xcbxv.c8
-rw-r--r--src/video_out/video_out_xvmc.c2
9 files changed, 16 insertions, 14 deletions
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 64422b9ad..b1e884a45 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -540,7 +540,7 @@ static void real_parse_headers (demux_real_t *this) {
lprintf("audio version %d detected\n", version);
- char *fourcc_ptr = "\0\0\0";
+ const char *fourcc_ptr = "\0\0\0";
switch(version) {
case 3:
/* Version 3 header stores fourcc after meta info - cheat by reading backwards from the
diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c
index d56f23376..1f130eff8 100644
--- a/src/post/audio/stretch.c
+++ b/src/post/audio/stretch.c
@@ -643,7 +643,7 @@ static post_plugin_t *stretch_open_plugin(post_class_t *class_gen, int inputs,
pthread_mutex_init (&this->lock, NULL);
- set_parameters ((xine_post_t *)&this->post, &init_params);
+ set_parameters (&this->post.xine_post, &init_params);
port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output);
port->new_port.open = stretch_port_open;
diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c
index 499856e69..7fb6c7bd9 100644
--- a/src/post/audio/upmix_mono.c
+++ b/src/post/audio/upmix_mono.c
@@ -315,7 +315,7 @@ static post_plugin_t *upmix_mono_open_plugin(post_class_t *class_gen, int inputs
pthread_mutex_init (&this->lock, NULL);
- set_parameters ((xine_post_t *)&this->post, &init_params);
+ set_parameters (&this->post.xine_post, &init_params);
port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output);
port->new_port.open = upmix_mono_port_open;
diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c
index a1f9c6efd..3cce42400 100644
--- a/src/post/deinterlace/xine_plugin.c
+++ b/src/post/deinterlace/xine_plugin.c
@@ -395,7 +395,7 @@ static post_plugin_t *deinterlace_open_plugin(post_class_t *class_gen, int input
pthread_mutex_init (&this->lock, NULL);
- set_parameters ((xine_post_t *)&this->post, &class->init_param);
+ set_parameters (&this->post.xine_post, &class->init_param);
port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output);
/* replace with our own get_frame function */
@@ -437,6 +437,7 @@ static void deinterlace_dispose(post_plugin_t *this_gen)
if (_x_post_dispose(this_gen)) {
_flush_frames(this);
pthread_mutex_destroy(&this->lock);
+ free(this->tvtime);
free(this);
}
}
diff --git a/src/spu_dec/spudvb_decoder.c b/src/spu_dec/spudvb_decoder.c
index c2492db8f..eb14fc540 100644
--- a/src/spu_dec/spudvb_decoder.c
+++ b/src/spu_dec/spudvb_decoder.c
@@ -34,6 +34,7 @@
#include <xine/xine_internal.h>
#include <xine/spu.h>
#include <xine/osd.h>
+
#define MAX_REGIONS 7
#define SPU_MAX_WIDTH 1920
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 5d8b60651..d00a916e1 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -229,7 +229,7 @@ typedef void *(*thread_run_t)(void *);
typedef struct {
/* Name of render backend */
- char *name;
+ const char * const name;
/* Finally display current image (needed for Redraw) */
void (*display)(opengl_driver_t *, opengl_frame_t *);
/* Upload new image; Returns 0 if failed */
@@ -678,7 +678,7 @@ static int render_image_envtex (opengl_driver_t *this, opengl_frame_t *frame) {
/*
* Render setup functions
*/
-static int render_help_verify_ext (opengl_driver_t *this, char *ext) {
+static int render_help_verify_ext (opengl_driver_t *this, const char *ext) {
int ret = 0;
const size_t l = strlen (ext);
const char *e;
@@ -929,7 +929,7 @@ static int render_setup_torus (opengl_driver_t *this) {
static int render_setup_fp_yuv (opengl_driver_t *this) {
GLint errorpos;
int ret;
- static char *fragprog_yuv =
+ static const char *fragprog_yuv =
"!!ARBfp1.0\n"
"ATTRIB tex = fragment.texcoord[0];"
"PARAM off = program.env[0];"
@@ -1823,7 +1823,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v
config_values_t *config = class->xine->config;
x11_visual_t *visual = (x11_visual_t *) visual_gen;
opengl_driver_t *this;
- char **render_fun_names;
+ const char **render_fun_names;
int i;
this = (opengl_driver_t *) calloc(1, sizeof(opengl_driver_t));
diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
index abc1f8b73..eb211e75d 100644
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -864,7 +864,7 @@ static int xshm_gui_data_exchange (vo_driver_t *this_gen,
break;
case XINE_GUI_SEND_DRAWABLE_CHANGED:
- this->window = (xcb_window_t) data;
+ this->window = (xcb_window_t) (long) data;
pthread_mutex_lock(&this->main_mutex);
xcb_free_gc(this->connection, this->gc);
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index 3019898b3..f098ceed8 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -826,7 +826,7 @@ static int xv_gui_data_exchange (vo_driver_t *this_gen,
case XINE_GUI_SEND_DRAWABLE_CHANGED:
pthread_mutex_lock(&this->main_mutex);
- this->window = (xcb_window_t) data;
+ this->window = (xcb_window_t) (long) data;
xcb_free_gc(this->connection, this->gc);
this->gc = xcb_generate_id(this->connection);
xcb_create_gc(this->connection, this->gc, this->window, 0, NULL);
@@ -973,9 +973,9 @@ static int xv_check_yv12(xcb_connection_t *connection, xcb_xv_port_t port) {
static void xv_check_capability (xv_driver_t *this,
int property, xcb_xv_attribute_info_t *attr,
int base_id,
- char *config_name,
- char *config_desc,
- char *config_help) {
+ const char *config_name,
+ const char *config_desc,
+ const char *config_help) {
int int_default;
cfg_entry_t *entry;
const char *str_prop = xcb_xv_attribute_info_name(attr);
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index f3321e929..3158840a0 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -783,7 +783,7 @@ static void xvmc_update_frame_format (vo_driver_t *this_gen,
frame->ratio = ratio;
}
- xvmc->macroblocks = (xine_macroblocks_t *)&this->macroblocks;
+ xvmc->macroblocks = &this->macroblocks.xine_mc;
this->macroblocks.num_blocks = 0;
this->macroblocks.macroblockptr = this->macroblocks.macroblockbaseptr;
this->macroblocks.xine_mc.blockptr =
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:39:56 +0000