summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/xine-engine/alphablend.c8
-rw-r--r--src/xine-engine/buffer.c4
-rw-r--r--src/xine-engine/configfile.c4
-rw-r--r--src/xine-engine/input_cache.c4
-rw-r--r--src/xine-engine/input_rip.c6
-rw-r--r--src/xine-engine/load_plugins.c48
-rw-r--r--src/xine-engine/resample.c12
-rw-r--r--src/xine-engine/xine_interface.c4
-rw-r--r--src/xine-utils/color.c7
-rw-r--r--src/xine-utils/xine_buffer.c4
-rw-r--r--src/xine-utils/xine_check.c2
-rw-r--r--src/xine-utils/xmllexer.c4
12 files changed, 57 insertions, 50 deletions
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c
index 8d10d0414..b38042369 100644
--- a/src/xine-engine/alphablend.c
+++ b/src/xine-engine/alphablend.c
@@ -1895,7 +1895,7 @@ static void colorToPalette(const uint32_t *icolor, unsigned char *palette_p,
unsigned num_xvmc_components, char *xvmc_components)
{
const clut_t *color = (const clut_t *) icolor;
- int i;
+ unsigned int i;
for (i=0; i<num_xvmc_components; ++i) {
switch(xvmc_components[i]) {
case 'V': *palette_p = color->cr; break;
@@ -1903,7 +1903,7 @@ static void colorToPalette(const uint32_t *icolor, unsigned char *palette_p,
case 'Y':
default: *palette_p = color->y; break;
}
- *palette_p++;
+ palette_p++;
}
}
@@ -1912,7 +1912,7 @@ 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)
{
- register int i;
+ register unsigned int i;
register const uint32_t *cluts = p->cluts + first_xx44_entry;
for (i=0; i<num_xx44_entries; ++i) {
@@ -1926,7 +1926,7 @@ void _x_xx44_to_xvmc_palette(const xx44_palette_t *p,unsigned char *xvmc_palette
static int xx44_paletteIndex(xx44_palette_t *p, int color, uint32_t clut)
{
- register int i;
+ register unsigned int i;
register uint32_t *cluts = p->cluts;
register int tmp;
diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c
index 4bf3f5fc9..c36e97877 100644
--- a/src/xine-engine/buffer.c
+++ b/src/xine-engine/buffer.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: buffer.c,v 1.35 2004/03/03 20:09:16 mroi Exp $
+ * $Id: buffer.c,v 1.36 2006/06/20 00:35:07 dgp85 Exp $
*
*
* contents:
@@ -501,7 +501,7 @@ fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size) {
fifo_buffer_t *this;
int i;
int alignment = 2048;
- char *multi_buffer = NULL;
+ unsigned char *multi_buffer = NULL;
this = xine_xmalloc (sizeof (fifo_buffer_t));
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 89b40cb13..2eb8cec96 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.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: configfile.c,v 1.79 2005/08/21 17:01:02 dsalt Exp $
+ * $Id: configfile.c,v 1.80 2006/06/20 00:35:07 dgp85 Exp $
*
* config object (was: file) management - implementation
*
@@ -969,7 +969,7 @@ void xine_config_save (xine_t *xine, const char *filename) {
size_t rlen;
buf = (char *) xine_xmalloc(config_stat.st_size + 1);
- if((rlen = fread(buf, 1, config_stat.st_size, f_config)) && (rlen == config_stat.st_size)) {
+ if((rlen = fread(buf, 1, config_stat.st_size, f_config)) && ((off_t)rlen == config_stat.st_size)) {
(void) fwrite(buf, 1, rlen, f_backup);
}
free(buf);
diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c
index 465203ccb..ae921f3f5 100644
--- a/src/xine-engine/input_cache.c
+++ b/src/xine-engine/input_cache.c
@@ -22,7 +22,7 @@
* The goal of this input plugin is to reduce
* the number of calls to the real input plugin.
*
- * $Id: input_cache.c,v 1.10 2006/05/22 17:00:40 mshopf Exp $
+ * $Id: input_cache.c,v 1.11 2006/06/20 00:35:07 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -45,7 +45,7 @@ typedef struct {
input_plugin_t *main_input_plugin; /* original input plugin */
xine_stream_t *stream;
- uint8_t buf[BUFFER_SIZE];
+ char buf[BUFFER_SIZE];
int buf_len;
int buf_pos;
diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c
index b03b237fd..bb6548bc2 100644
--- a/src/xine-engine/input_rip.c
+++ b/src/xine-engine/input_rip.c
@@ -29,7 +29,7 @@
* - it's possible speeder saving streams in the xine without playing:
* xine stream_mrl#save:file.raw\;noaudio\;novideo
*
- * $Id: input_rip.c,v 1.30 2006/05/07 09:37:31 valtri Exp $
+ * $Id: input_rip.c,v 1.31 2006/06/20 00:35:07 dgp85 Exp $
*/
/* TODO:
@@ -335,7 +335,7 @@ static off_t rip_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin)
char buffer[SCRATCH_SIZE];
rip_input_plugin_t *this = (rip_input_plugin_t *)this_gen;
uint32_t blocksize;
- off_t newpos, toread, reqpos, pos;
+ off_t newpos, reqpos, pos;
struct timeval time1, time2;
double interval = 0;
@@ -411,7 +411,7 @@ static off_t rip_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin)
else
break;
} else {
- toread = newpos - this->curpos;
+ size_t toread = newpos - this->curpos;
if( toread > sizeof(buffer) )
toread = sizeof(buffer);
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 3a7302ef9..44e7a393c 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.221 2006/04/08 16:42:37 valtri Exp $
+ * $Id: load_plugins.c,v 1.222 2006/06/20 00:35:08 dgp85 Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -286,18 +286,24 @@ static void _insert_node (xine_t *this,
plugin_info_t *info,
int api_version){
- plugin_catalog_t *catalog = this->plugin_catalog;
- plugin_node_t *entry;
- vo_info_t *vo_new, *vo_old;
- ao_info_t *ao_new, *ao_old;
- decoder_info_t *decoder_new, *decoder_old;
- post_info_t *post_new, *post_old;
- demuxer_info_t *demux_new, *demux_old;
- input_info_t *input_new, *input_old;
- uint32_t *types;
- char key[80];
- char desc[100];
- int i;
+ plugin_catalog_t *catalog = this->plugin_catalog;
+ plugin_node_t *entry;
+ vo_info_t *vo_new;
+ const vo_info_t *vo_old;
+ ao_info_t *ao_new;
+ const ao_info_t *ao_old;
+ decoder_info_t *decoder_new;
+ const decoder_info_t *decoder_old;
+ post_info_t *post_new;
+ const post_info_t *post_old;
+ demuxer_info_t *demux_new;
+ const demuxer_info_t *demux_old;
+ input_info_t *input_new;
+ const input_info_t *input_old;
+ uint32_t *types;
+ char key[80];
+ char desc[100];
+ int i;
_x_assert(list);
_x_assert(info);
@@ -792,14 +798,14 @@ static void load_required_plugins(xine_t *this) {
*/
static void save_plugin_list(FILE *fp, xine_sarray_t *list) {
- plugin_node_t *node;
- plugin_file_t *file;
- decoder_info_t *decoder_info;
- demuxer_info_t *demuxer_info;
- input_info_t *input_info;
- vo_info_t *vo_info;
- ao_info_t *ao_info;
- post_info_t *post_info;
+ const plugin_node_t *node;
+ const plugin_file_t *file;
+ const decoder_info_t *decoder_info;
+ const demuxer_info_t *demuxer_info;
+ const input_info_t *input_info;
+ const vo_info_t *vo_info;
+ const ao_info_t *ao_info;
+ const post_info_t *post_info;
int i;
int list_id = 0;
diff --git a/src/xine-engine/resample.c b/src/xine-engine/resample.c
index e6ee0adf6..a081a01ea 100644
--- a/src/xine-engine/resample.c
+++ b/src/xine-engine/resample.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: resample.c,v 1.8 2003/12/09 00:02:37 f1rmb Exp $
+ * $Id: resample.c,v 1.9 2006/06/20 00:35:08 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -32,7 +32,7 @@
void _x_audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples,
int16_t* output_samples, uint32_t out_samples)
{
- int osample;
+ unsigned int osample;
/* 16+16 fixed point math */
uint32_t isample = 0;
uint32_t istep = ((in_samples-2) << 16)/(out_samples-2);
@@ -63,7 +63,7 @@ void _x_audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples,
void _x_audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples,
int16_t* output_samples, uint32_t out_samples)
{
- int osample;
+ unsigned int osample;
/* 16+16 fixed point math */
uint32_t isample = 0;
uint32_t istep = ((in_samples-2) << 16)/(out_samples-2);
@@ -101,7 +101,7 @@ void _x_audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples,
void _x_audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples,
int16_t* output_samples, uint32_t out_samples)
{
- int osample;
+ unsigned int osample;
/* 16+16 fixed point math */
uint32_t isample = 0;
uint32_t istep = ((in_samples-2) << 16)/(out_samples-2);
@@ -155,7 +155,7 @@ void _x_audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples,
void _x_audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples,
int16_t* output_samples, uint32_t out_samples)
{
- int osample;
+ unsigned int osample;
/* 16+16 fixed point math */
uint32_t isample = 0;
uint32_t istep = ((in_samples-2) << 16)/(out_samples-2);
@@ -216,7 +216,7 @@ void _x_audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples,
void _x_audio_out_resample_6channel(int16_t* input_samples, uint32_t in_samples,
int16_t* output_samples, uint32_t out_samples)
{
- int osample;
+ unsigned int osample;
/* 16+16 fixed point math */
uint32_t isample = 0;
uint32_t istep = ((in_samples-2) << 16)/(out_samples-2);
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 20d99d41f..70d9bd0fb 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.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_interface.c,v 1.94 2006/06/18 22:51:29 dgp85 Exp $
+ * $Id: xine_interface.c,v 1.95 2006/06/20 00:35:08 dgp85 Exp $
*
* convenience/abstraction layer, functions to implement
* libxine's public interface
@@ -923,7 +923,7 @@ int _x_message(xine_stream_t *stream, int type, ...) {
if (!stream) return 0;
- if( type >= 0 && type < sizeof(std_explanation)/
+ if( type >= 0 && (size_t)type < sizeof(std_explanation)/
sizeof(std_explanation[0]) ) {
explanation = _(std_explanation[type]);
size = strlen(explanation)+1;
diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c
index 992f0bcc7..c667c678c 100644
--- a/src/xine-utils/color.c
+++ b/src/xine-utils/color.c
@@ -61,7 +61,7 @@
* instructions), these macros will automatically map to those special
* instructions.
*
- * $Id: color.c,v 1.28 2006/02/14 19:12:16 dsalt Exp $
+ * $Id: color.c,v 1.29 2006/06/20 00:35:08 dgp85 Exp $
*/
#include "xine_internal.h"
@@ -204,7 +204,7 @@ void free_yuv_planes(yuv_planes_t *yuv_planes) {
static void yuv444_to_yuy2_c(const yuv_planes_t *yuv_planes, unsigned char *yuy2_map,
int pitch) {
- int row_ptr, pixel_ptr;
+ unsigned int row_ptr, pixel_ptr;
int yuy2_index;
/* copy the Y samples */
@@ -318,7 +318,8 @@ static void yuv444_to_yuy2_c(const yuv_planes_t *yuv_planes, unsigned char *yuy2
static void yuv444_to_yuy2_mmx(const yuv_planes_t *yuv_planes, unsigned char *yuy2_map,
int pitch) {
#if defined(ARCH_X86) || defined(ARCH_X86_64)
- int h, i, j, k;
+ unsigned int i;
+ int h, j, k;
int width_div_8 = yuv_planes->row_width / 8;
int width_mod_8 = yuv_planes->row_width % 8;
unsigned char *source_plane;
diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c
index 8dafd23f1..0a10f80a2 100644
--- a/src/xine-utils/xine_buffer.c
+++ b/src/xine-utils/xine_buffer.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_buffer.c,v 1.9 2006/02/14 19:12:16 dsalt Exp $
+ * $Id: xine_buffer.c,v 1.10 2006/06/20 00:35:08 dgp85 Exp $
*
*
* generic dynamic buffer functions. The goals
@@ -187,7 +187,7 @@ void *_xine_buffer_copyin(void *buf, int index, const void *data, int len) {
CHECK_MAGIC(buf);
#endif
- GROW_TO(buf, index+len);
+ GROW_TO(buf, (size_t)index+len);
xine_fast_memcpy(((uint8_t*)buf)+index, data, len);
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index 6e4d0c882..c2dcccbdf 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.c
@@ -359,7 +359,7 @@ xine_health_check_t* _x_health_check_xv (xine_health_check_t* hc) {
Display *(*xopendisplay)(char*);
char *(*xdisplayname)(char*);
int (*xvqueryextension)(Display*, unsigned int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*);
- int (*xvqueryadaptors)(Display*, Window, unsigned int*, XvAdaptorInfo**);
+ int (*xvqueryadaptors)(Display*, Window, int*, XvAdaptorInfo**);
XvImageFormatValues *(*xvlistimageformats)(Display*, XvPortID, int*);
char *err = NULL;
int formats, adaptors, i;
diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index 91f5bf88d..cc112b64a 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.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: xmllexer.c,v 1.11 2006/02/14 02:25:00 dsalt Exp $
+ * $Id: xmllexer.c,v 1.12 2006/06/20 00:35:08 dgp85 Exp $
*
*/
@@ -424,7 +424,7 @@ static struct {
{ '\'', 4, "apos" },
{ '<', 2, "lt" },
{ '>', 2, "gt" },
- { 0 }
+ { '\0', 0, "" }
};
char *lexer_decode_entities (const char *tok)
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 12:30:26 +0000