summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/a52dec/imdct.c2
-rw-r--r--contrib/a52dec/parse.c2
-rw-r--r--contrib/gsm610/long_term.c2
-rw-r--r--contrib/gsm610/lpc.c2
-rw-r--r--contrib/gsm610/rpe.c2
-rw-r--r--contrib/gsm610/short_term.c2
-rw-r--r--contrib/libmpcdec/mpcdec/config_types.h2
-rw-r--r--contrib/nosefart/log.h2
-rw-r--r--contrib/vidix/drivers/mga_vid.c4
-rw-r--r--contrib/vidix/drivers/nvidia_vid.c4
-rw-r--r--contrib/vidix/drivers/savage_vid.c6
11 files changed, 15 insertions, 15 deletions
diff --git a/contrib/a52dec/imdct.c b/contrib/a52dec/imdct.c
index 5835e70a1..aa1c85464 100644
--- a/contrib/a52dec/imdct.c
+++ b/contrib/a52dec/imdct.c
@@ -38,7 +38,7 @@
#include "a52.h"
#include "a52_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
typedef struct complex_s {
sample_t real;
diff --git a/contrib/a52dec/parse.c b/contrib/a52dec/parse.c
index 0bfd02fce..7aba1d809 100644
--- a/contrib/a52dec/parse.c
+++ b/contrib/a52dec/parse.c
@@ -31,7 +31,7 @@
#include "a52_internal.h"
#include "bitstream.h"
#include "tables.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
typedef struct {
sample_t q1[2];
diff --git a/contrib/gsm610/long_term.c b/contrib/gsm610/long_term.c
index 625662e1f..671d98cc1 100644
--- a/contrib/gsm610/long_term.c
+++ b/contrib/gsm610/long_term.c
@@ -7,7 +7,7 @@
/* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/long_term.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
#include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
#include "private.h"
diff --git a/contrib/gsm610/lpc.c b/contrib/gsm610/lpc.c
index 0f51fa55f..d85f56111 100644
--- a/contrib/gsm610/lpc.c
+++ b/contrib/gsm610/lpc.c
@@ -7,7 +7,7 @@
/* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/lpc.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
#include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
#include "private.h"
diff --git a/contrib/gsm610/rpe.c b/contrib/gsm610/rpe.c
index 67d94d30e..68d495b3b 100644
--- a/contrib/gsm610/rpe.c
+++ b/contrib/gsm610/rpe.c
@@ -7,7 +7,7 @@
/* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/rpe.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
#include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
#include "private.h"
#include "gsm.h"
diff --git a/contrib/gsm610/short_term.c b/contrib/gsm610/short_term.c
index 8222b2caa..34a9e7734 100644
--- a/contrib/gsm610/short_term.c
+++ b/contrib/gsm610/short_term.c
@@ -7,7 +7,7 @@
/* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/short_term.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
#include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
#include "private.h"
#include "gsm.h"
diff --git a/contrib/libmpcdec/mpcdec/config_types.h b/contrib/libmpcdec/mpcdec/config_types.h
index 97197d048..98c6cf21b 100644
--- a/contrib/libmpcdec/mpcdec/config_types.h
+++ b/contrib/libmpcdec/mpcdec/config_types.h
@@ -35,7 +35,7 @@
#ifndef __MUSEPACK_CONFIG_TYPES_H__
#define __MUSEPACK_CONFIG_TYPES_H__
-#include "os_types.h"
+#include <xine/os_types.h>
typedef unsigned char mpc_bool_t;
#define TRUE 1
diff --git a/contrib/nosefart/log.h b/contrib/nosefart/log.h
index a12deff0a..da2548c80 100644
--- a/contrib/nosefart/log.h
+++ b/contrib/nosefart/log.h
@@ -27,7 +27,7 @@
#define _LOG_H_
#include <stdio.h>
-#include "attributes.h"
+#include <xine/attributes.h>
extern int log_init(void);
extern void log_shutdown(void);
diff --git a/contrib/vidix/drivers/mga_vid.c b/contrib/vidix/drivers/mga_vid.c
index eed2b9e65..edebc0c4f 100644
--- a/contrib/vidix/drivers/mga_vid.c
+++ b/contrib/vidix/drivers/mga_vid.c
@@ -425,7 +425,7 @@ static void mga_vid_write_regs(int restore)
writeb(PALWTADD, XCOLMSK);
writeb(X_DATAREG, colkey_mask[3]);
- printf(MGA_MSG" Restored colorkey (ON: %d %02X:%02X:%02X)\n",
+ printf(MGA_MSG" Restored colour key (ON: %d %02X:%02X:%02X)\n",
colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]);
} else if (!colkey_saved) {
@@ -453,7 +453,7 @@ static void mga_vid_write_regs(int restore)
writeb(PALWTADD, XCOLMSK);
colkey_mask[3]=(unsigned char)readb(X_DATAREG);
- printf(MGA_MSG" Saved colorkey (ON: %d %02X:%02X:%02X)\n",
+ printf(MGA_MSG" Saved colour key (ON: %d %02X:%02X:%02X)\n",
colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]);
}
diff --git a/contrib/vidix/drivers/nvidia_vid.c b/contrib/vidix/drivers/nvidia_vid.c
index 34fa27cb7..b051df326 100644
--- a/contrib/vidix/drivers/nvidia_vid.c
+++ b/contrib/vidix/drivers/nvidia_vid.c
@@ -955,12 +955,12 @@ int vixSetGrKeys( const vidix_grkey_t * grkey){
if (grkey->ckey.op == CKEY_FALSE)
{
info->use_colorkey = 0;
- printf("[nvidia_vid] colorkeying disabled\n");
+ printf("[nvidia_vid] colour keying disabled\n");
}
else {
info->use_colorkey = 1;
info->vidixcolorkey = ((grkey->ckey.red<<16)|(grkey->ckey.green<<8)|grkey->ckey.blue);
- printf("[nvidia_vid] set colorkey 0x%x\n",info->vidixcolorkey);
+ printf("[nvidia_vid] set colour key 0x%x\n",info->vidixcolorkey);
}
if(info->d_width && info->d_height)rivatv_overlay_start(info,0);
return 0;
diff --git a/contrib/vidix/drivers/savage_vid.c b/contrib/vidix/drivers/savage_vid.c
index 2ac76198d..17040cc15 100644
--- a/contrib/vidix/drivers/savage_vid.c
+++ b/contrib/vidix/drivers/savage_vid.c
@@ -370,7 +370,7 @@ static void SavageSetColorKeyOld(void)
blue = info->vidixcolorkey & 0x000000FF;
if( !info->vidixcolorkey ) {
- printf("SavageSetColorKey disabling colorkey\n");
+ printf("SavageSetColorKey disabling colour key\n");
OUTREG( COL_CHROMA_KEY_CONTROL_REG, 0 );
OUTREG( CHROMA_KEY_UPPER_BOUND_REG, 0 );
OUTREG( BLEND_CONTROL_REG, 0 );
@@ -1134,13 +1134,13 @@ vixSetGrKeys (const vidix_grkey_t * grkey)
{
info->use_colorkey = 0;
info->vidixcolorkey=0;
- printf("[savage_vid] colorkeying disabled\n");
+ printf("[savage_vid] colour keying disabled\n");
}
else {
info->use_colorkey = 1;
info->vidixcolorkey = ((grkey->ckey.red<<16)|(grkey->ckey.green<<8)|grkey->ckey.blue);
- printf("[savage_vid] set colorkey 0x%x\n",info->vidixcolorkey);
+ printf("[savage_vid] set colour key 0x%x\n",info->vidixcolorkey);
}
//FIXME: freezes if streams arent enabled
SavageSetColorKeyOld();
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 13:22:10 +0000