[MPlayer-dev-eng] [PATCH] (SuSE) multiple patches - please review!
gabucino at mplayerhq.hu
gabucino at mplayerhq.hu
Fri Sep 26 14:46:23 CEST 2003
SuSE has come to the decision of removing MPlayer from distribution :(
Additionally, these are the patches SuSE was applying on MPlayer. I think
we should apply at least a part of them (most are portability fixes).
Please review!
--
Gabucino
MPlayer Core Team
-------------- next part --------------
diff -ruN MPlayer-0.90pre9.orig/unrarlib.c MPlayer-0.90pre9/unrarlib.c
--- MPlayer-0.90pre9.orig/unrarlib.c 2002-09-20 03:26:39.000000000 +0200
+++ MPlayer-0.90pre9/unrarlib.c 2003-01-30 18:40:52.000000000 +0100
@@ -2673,9 +2673,18 @@
FILE *fp;
char date[] = __DATE__;
char time[] = __TIME__;
+ char *homedir;
debug_start_time = GetTickCount(); /* get start time */
- strcpy(log_file_name, file_name); /* save file name */
+/* strcpy(log_file_name, file_name); */ /* save file name */
+ homedir=getenv("HOME");
+ if(homedir)
+ {
+ snprintf(log_file_name, sizeof(log_file_name)-1, file_name, homedir );
+ } else {
+ sprintf(log_file_name, file_name, ".");
+ }
+ log_file_name[sizeof(log_file_name)-1]='\0';
if((fp = fopen(log_file_name, CREATETEXT)) != NULL)
{
diff -ruN MPlayer-0.90pre9.orig/unrarlib.h MPlayer-0.90pre9/unrarlib.h
--- MPlayer-0.90pre9.orig/unrarlib.h 2002-09-20 03:26:39.000000000 +0200
+++ MPlayer-0.90pre9/unrarlib.h 2003-01-30 18:41:58.000000000 +0100
@@ -72,7 +72,8 @@
#define _DEBUG_LOG_FILE "C:\\temp\\debug_unrar.txt" /* log file path */
#else
#define _UNIX /* Linux or Unix with GCC */
-#define _DEBUG_LOG_FILE "/tmp/debug_unrar.txt" /* log file path */
+ /* CAUTION: Do not remove this format string here. It's needed. */
+#define _DEBUG_LOG_FILE "%s/debug_unrar.txt" /* log file path */
/*#define NON_INTEL_BYTE_ORDER*/ /* GCC on motorola systems */
#endif
-------------- next part --------------
diff -ru MPlayer-0.90rc3.orig/libvo/vo_directfb.c MPlayer-0.90rc3-DSPF_RGB15/libvo/vo_directfb.c
--- MPlayer-0.90rc3.orig/libvo/vo_directfb.c 2002-12-22 17:31:05.000000000 +0100
+++ MPlayer-0.90rc3-DSPF_RGB15/libvo/vo_directfb.c 2003-02-07 15:35:36.000000000 +0100
@@ -679,8 +679,8 @@
case IMGFMT_BGR24: dlc.pixelformat = DSPF_RGB24; break;
case IMGFMT_RGB16: dlc.pixelformat = DSPF_RGB16; break;
case IMGFMT_BGR16: dlc.pixelformat = DSPF_RGB16; break;
- case IMGFMT_RGB15: dlc.pixelformat = DSPF_RGB15; break;
- case IMGFMT_BGR15: dlc.pixelformat = DSPF_RGB15; break;
+ case IMGFMT_RGB15: dlc.pixelformat = DSPF_ARGB1555; break;
+ case IMGFMT_BGR15: dlc.pixelformat = DSPF_ARGB1555; break;
default: dlc.pixelformat = DSPF_RGB24; break;
}
@@ -693,7 +693,7 @@
break;
case DSPF_RGB16: printf("DirectFB: layer format RGB16\n");
break;
- case DSPF_RGB15: printf("DirectFB: layer format RGB15\n");
+ case DSPF_ARGB1555: printf("DirectFB: layer format RGB15\n");
break;
case DSPF_YUY2: printf("DirectFB: layer format YUY2\n");
break;
@@ -769,8 +769,8 @@
case IMGFMT_BGR24: dsc.pixelformat = DSPF_RGB24; source_pixel_size= 3; break;
case IMGFMT_RGB16: dsc.pixelformat = DSPF_RGB16; source_pixel_size= 2; break;
case IMGFMT_BGR16: dsc.pixelformat = DSPF_RGB16; source_pixel_size= 2; break;
- case IMGFMT_RGB15: dsc.pixelformat = DSPF_RGB15; source_pixel_size= 2; break;
- case IMGFMT_BGR15: dsc.pixelformat = DSPF_RGB15; source_pixel_size= 2; break;
+ case IMGFMT_RGB15: dsc.pixelformat = DSPF_ARGB1555; source_pixel_size= 2; break;
+ case IMGFMT_BGR15: dsc.pixelformat = DSPF_ARGB1555; source_pixel_size= 2; break;
default: dsc.pixelformat = DSPF_RGB24; source_pixel_size=2; break; //YUV formats
};
@@ -857,8 +857,8 @@
case IMGFMT_BGR24: dsc.pixelformat = DSPF_RGB24; break;
case IMGFMT_RGB16: dsc.pixelformat = DSPF_RGB16; break;
case IMGFMT_BGR16: dsc.pixelformat = DSPF_RGB16; break;
- case IMGFMT_RGB15: dsc.pixelformat = DSPF_RGB15; break;
- case IMGFMT_BGR15: dsc.pixelformat = DSPF_RGB15; break;
+ case IMGFMT_RGB15: dsc.pixelformat = DSPF_ARGB1555; break;
+ case IMGFMT_BGR15: dsc.pixelformat = DSPF_ARGB1555; break;
default: dsc.pixelformat = frame_format; break; // uknown or YUV -> retain layer format eg. RGB or YUY2
};
@@ -952,7 +952,7 @@
case DSPF_RGB16: if (verbose) printf("DirectFB: frame format RGB16\n");
frame_pixel_size = 2;
break;
- case DSPF_RGB15: if (verbose) printf("DirectFB: frame format RGB15\n");
+ case DSPF_ARGB1555: if (verbose) printf("DirectFB: frame format RGB15\n");
frame_pixel_size = 2;
break;
case DSPF_YUY2: if (verbose) printf("DirectFB: frame format YUY2\n");
@@ -992,8 +992,8 @@
(format==IMGFMT_BGR24)&&(frame_format ==DSPF_RGB24) ||
(format==IMGFMT_RGB16)&&(frame_format ==DSPF_RGB16) ||
(format==IMGFMT_BGR16)&&(frame_format ==DSPF_RGB16) ||
- (format==IMGFMT_RGB15)&&(frame_format ==DSPF_RGB15) ||
- (format==IMGFMT_BGR15)&&(frame_format ==DSPF_RGB15) ||
+ (format==IMGFMT_RGB15)&&(frame_format ==DSPF_ARGB1555) ||
+ (format==IMGFMT_BGR15)&&(frame_format ==DSPF_ARGB1555) ||
#if DIRECTFBVERSION > 908
(format==IMGFMT_YUY2)&&(frame_format ==DSPF_YUY2) ||
(format==IMGFMT_YV12)&&(frame_format ==DSPF_I420) ||
@@ -1117,7 +1117,7 @@
vo_draw_alpha_rgb16(w,h,src,srca,stride,((uint8_t *) dst)+pitch*y0 + frame_pixel_size*x0,pitch);
break;
- case DSPF_RGB15:
+ case DSPF_ARGB1555:
vo_draw_alpha_rgb15(w,h,src,srca,stride,((uint8_t *) dst)+pitch*y0 + frame_pixel_size*x0,pitch);
break;
@@ -1168,7 +1168,7 @@
case DSPF_RGB32:
case DSPF_RGB24:
case DSPF_RGB16:
- case DSPF_RGB15: switch (pixel_format) {
+ case DSPF_ARGB1555: switch (pixel_format) {
case IMGFMT_YV12:
yuv2rgb(dst,src[0],src[1],src[2],in_width,in_height,pitch,in_width,in_width/2);
break;
@@ -1294,7 +1294,7 @@
case DSPF_RGB32:
case DSPF_RGB24:
case DSPF_RGB16:
- case DSPF_RGB15:
+ case DSPF_ARGB1555:
switch (pixel_format) {
case IMGFMT_YV12:
yuv2rgb(dst+ y * pitch + frame_pixel_size*x ,src[0],src[1],src[2],w,h,pitch,stride[0],stride[1]);
-------------- next part --------------
diff -ur mplayer-1.0pre1.orig/configure mplayer-1.0pre1/configure
--- mplayer-1.0pre1.orig/configure 2003-09-01 12:51:11.000000000 +0200
+++ mplayer-1.0pre1/configure 2003-09-26 11:27:23.000000000 +0200
@@ -921,6 +921,46 @@
fi
;;
+ ia64)
+ _def_arch='#define ARCH_IA64 1'
+ _target_arch='TARGET_ARCH_IA64 = yes'
+ _def_words_endian='#undef WORDS_BIGENDIAN'
+ iproc='ia64'
+ proc=''
+ _march=''
+ _mcpu=''
+ ;;
+
+ x86_64)
+ _def_arch='#define ARCH_X86_64 1'
+ _target_arch='TARGET_ARCH_X86_64 = yes'
+ _def_words_endian='#undef WORDS_BIGENDIAN'
+ iproc='x86_64'
+ proc=''
+ _march=''
+ _mcpu=''
+ ;;
+
+ s390)
+ _def_arch='#define ARCH_S390 1'
+ _target_arch='TARGET_ARCH_S390 = yes'
+ _def_words_endian='#define WORDS_BIGENDIAN 1'
+ iproc='s390'
+ proc=''
+ _march=''
+ _mcpu=''
+ ;;
+
+ s390x)
+ _def_arch='#define ARCH_S390X 1'
+ _target_arch='TARGET_ARCH_S390X = yes'
+ _def_words_endian='#define WORDS_BIGENDIAN 1'
+ iproc='s390x'
+ proc=''
+ _march=''
+ _mcpu=''
+ ;;
+
mips)
_def_arch='#define ARCH_SGI_MIPS 1'
_target_arch='TARGET_ARCH_SGI_MIPS = yes'
@@ -1582,7 +1622,7 @@
else
echores "failed"
echo "Upgrade binutils to ${_pref_as_version} ..."
- die "obsolete binutils version"
+ #die "obsolete binutils version"
fi
fi
@@ -5264,9 +5304,9 @@
_stripbinaries=no
elif test -z "$CFLAGS" ; then
if test "$host_arch" != "mips" ; then
- CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer"
+ CFLAGS="$_march $_mcpu $RPM_OPT_FLAGS -pipe -ffast-math -fomit-frame-pointer"
else
- CFLAGS="-O4 $_march $_mcpu -ffast-math -fomit-frame-pointer"
+ CFLAGS="$_march $_mcpu $RPM_OPT_FLAGS -ffast-math -fomit-frame-pointer"
fi
# always compile with '-g' if .developer:
if test -f ".developer" ; then
diff -ur mplayer-1.0pre1.orig/etc/example.conf mplayer-1.0pre1/etc/example.conf
--- mplayer-1.0pre1.orig/etc/example.conf 2003-05-15 00:49:02.000000000 +0200
+++ mplayer-1.0pre1/etc/example.conf 2003-09-26 11:27:23.000000000 +0200
@@ -14,7 +14,7 @@
# ao=oss # To specify default audio driver (see -ao help for
# list)
-fs=yes # Enlarges movie window to your desktop's size.
+#fs=yes # Enlarges movie window to your desktop's size.
# Used by drivers: all
# vm=no # Tries to change to a different videomode
@@ -106,10 +106,10 @@
## Other (preferred to be default from configfile) switches
##
-framedrop = yes # drop frames, when not in sync (slow CPU, videocard,
+#framedrop = yes # drop frames, when not in sync (slow CPU, videocard,
# etc)
-cache = 8192 # use 8Mb input cache by default
+#cache = 8192 # use 8Mb input cache by default
# slang = en # DVD : display english subtitles if available
# alang = en # DVD : play english audio tracks if available
@@ -127,4 +127,4 @@
## Delete this default :)
##
-include = /home/gabucino/.mplayer/i_did_not_RTFM_carefully_enough...
+#include = /home/gabucino/.mplayer/i_did_not_RTFM_carefully_enough...
diff -ur mplayer-1.0pre1.orig/libao2/ao_alsa5.c mplayer-1.0pre1/libao2/ao_alsa5.c
--- mplayer-1.0pre1.orig/libao2/ao_alsa5.c 2003-07-03 22:07:54.000000000 +0200
+++ mplayer-1.0pre1/libao2/ao_alsa5.c 2003-09-26 11:35:50.000000000 +0200
@@ -32,7 +32,7 @@
static int alsa_rate = SND_PCM_RATE_CONTINUOUS;
/* to set/get/query special features/parameters */
-static int control(int cmd, void *arg)
+static long control(int cmd, void *arg)
{
return(CONTROL_UNKNOWN);
}
diff -ur mplayer-1.0pre1.orig/libao2/ao_alsa9.c mplayer-1.0pre1/libao2/ao_alsa9.c
--- mplayer-1.0pre1.orig/libao2/ao_alsa9.c 2003-08-18 15:39:07.000000000 +0200
+++ mplayer-1.0pre1/libao2/ao_alsa9.c 2003-09-26 11:34:01.000000000 +0200
@@ -80,7 +80,7 @@
/* to set/get/query special features/parameters */
-static int control(int cmd, void *arg)
+static long control(int cmd, void *arg)
{
switch(cmd) {
case AOCONTROL_QUERY_FORMAT:
diff -ur mplayer-1.0pre1.orig/libao2/ao_arts.c mplayer-1.0pre1/libao2/ao_arts.c
--- mplayer-1.0pre1.orig/libao2/ao_arts.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/ao_arts.c 2003-09-26 11:35:05.000000000 +0200
@@ -34,7 +34,7 @@
LIBAO_EXTERN(arts)
-static int control(int cmd, void *arg)
+static long control(int cmd, void *arg)
{
return(CONTROL_UNKNOWN);
}
diff -ur mplayer-1.0pre1.orig/libao2/ao_dxr2.c mplayer-1.0pre1/libao2/ao_dxr2.c
--- mplayer-1.0pre1.orig/libao2/ao_dxr2.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/ao_dxr2.c 2003-09-26 11:32:47.000000000 +0200
@@ -28,7 +28,7 @@
extern int dxr2_fd;
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_GET_VOLUME:
if(dxr2_fd > 0) {
diff -ur mplayer-1.0pre1.orig/libao2/ao_esd.c mplayer-1.0pre1/libao2/ao_esd.c
--- mplayer-1.0pre1.orig/libao2/ao_esd.c 2003-05-30 20:15:59.000000000 +0200
+++ mplayer-1.0pre1/libao2/ao_esd.c 2003-09-26 11:34:12.000000000 +0200
@@ -73,7 +73,7 @@
/*
* to set/get/query special features/parameters
*/
-static int control(int cmd, void *arg)
+static long control(int cmd, void *arg)
{
esd_player_info_t *esd_pi;
esd_info_t *esd_i;
diff -ur mplayer-1.0pre1.orig/libao2/ao_mpegpes.c mplayer-1.0pre1/libao2/ao_mpegpes.c
--- mplayer-1.0pre1.orig/libao2/ao_mpegpes.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/ao_mpegpes.c 2003-09-26 11:36:40.000000000 +0200
@@ -49,7 +49,7 @@
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
#ifdef HAVE_DVB
switch(cmd){
case AOCONTROL_GET_VOLUME:
diff -ur mplayer-1.0pre1.orig/libao2/ao_nas.c mplayer-1.0pre1/libao2/ao_nas.c
--- mplayer-1.0pre1.orig/libao2/ao_nas.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/ao_nas.c 2003-09-26 11:36:00.000000000 +0200
@@ -333,7 +333,7 @@
}
// to set/get/query special features/parameters
-static int control(int cmd, void *arg)
+static long control(int cmd, void *arg)
{
AuDeviceAttributes *dattr;
AuFixedPoint fpgain;
diff -ur mplayer-1.0pre1.orig/libao2/ao_null.c mplayer-1.0pre1/libao2/ao_null.c
--- mplayer-1.0pre1.orig/libao2/ao_null.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/ao_null.c 2003-09-26 11:35:14.000000000 +0200
@@ -41,7 +41,7 @@
}
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
return -1;
}
diff -ur mplayer-1.0pre1.orig/libao2/ao_oss.c mplayer-1.0pre1/libao2/ao_oss.c
--- mplayer-1.0pre1.orig/libao2/ao_oss.c 2003-08-13 23:04:15.000000000 +0200
+++ mplayer-1.0pre1/libao2/ao_oss.c 2003-09-26 11:33:25.000000000 +0200
@@ -39,7 +39,7 @@
char *oss_mixer_device = PATH_DEV_MIXER;
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_SET_DEVICE:
dsp=(char*)arg;
diff -ur mplayer-1.0pre1.orig/libao2/ao_pcm.c mplayer-1.0pre1/libao2/ao_pcm.c
--- mplayer-1.0pre1.orig/libao2/ao_pcm.c 2003-05-06 01:43:30.000000000 +0200
+++ mplayer-1.0pre1/libao2/ao_pcm.c 2003-09-26 11:34:21.000000000 +0200
@@ -32,19 +32,19 @@
struct WaveHeader
{
- unsigned long riff;
- unsigned long file_length;
- unsigned long wave;
- unsigned long fmt;
- unsigned long fmt_length;
- short fmt_tag;
- short channels;
- unsigned long sample_rate;
- unsigned long bytes_per_second;
- short block_align;
- short bits;
- unsigned long data;
- unsigned long data_length;
+ uint32_t riff;
+ uint32_t file_length;
+ uint32_t wave;
+ uint32_t fmt;
+ uint32_t fmt_length;
+ int16_t fmt_tag;
+ int16_t channels;
+ uint32_t sample_rate;
+ uint32_t bytes_per_second;
+ int16_t block_align;
+ int16_t bits;
+ uint32_t data;
+ uint32_t data_length;
};
/* init with default values */
@@ -68,7 +68,7 @@
static FILE *fp = NULL;
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
return -1;
}
diff -ur mplayer-1.0pre1.orig/libao2/ao_plugin.c mplayer-1.0pre1/libao2/ao_plugin.c
--- mplayer-1.0pre1.orig/libao2/ao_plugin.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/ao_plugin.c 2003-09-26 11:35:37.000000000 +0200
@@ -44,7 +44,7 @@
ao_plugin_cfg_t ao_plugin_cfg=CFG_DEFAULTS; // Set in cfg-mplayer.h
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_SET_PLUGIN_DRIVER:
ao_plugin_local_data.driver=arg;
diff -ur mplayer-1.0pre1.orig/libao2/ao_sdl.c mplayer-1.0pre1/libao2/ao_sdl.c
--- mplayer-1.0pre1.orig/libao2/ao_sdl.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/ao_sdl.c 2003-09-26 11:34:43.000000000 +0200
@@ -113,7 +113,7 @@
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch (cmd) {
case AOCONTROL_GET_VOLUME:
{
diff -ur mplayer-1.0pre1.orig/libao2/ao_sgi.c mplayer-1.0pre1/libao2/ao_sgi.c
--- mplayer-1.0pre1.orig/libao2/ao_sgi.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/ao_sgi.c 2003-09-26 11:36:28.000000000 +0200
@@ -27,7 +27,7 @@
static ALport ao_port;
// to set/get/query special features/parameters
-static int control(int cmd, void *arg){
+static long control(int cmd, void *arg){
printf("ao_sgi, control\n");
diff -ur mplayer-1.0pre1.orig/libao2/ao_sun.c mplayer-1.0pre1/libao2/ao_sun.c
--- mplayer-1.0pre1.orig/libao2/ao_sun.c 2003-06-22 23:29:15.000000000 +0200
+++ mplayer-1.0pre1/libao2/ao_sun.c 2003-09-26 11:32:27.000000000 +0200
@@ -376,7 +376,7 @@
}
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_SET_DEVICE:
audio_dev=(char*)arg;
diff -ur mplayer-1.0pre1.orig/libao2/audio_out.h mplayer-1.0pre1/libao2/audio_out.h
--- mplayer-1.0pre1.orig/libao2/audio_out.h 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/audio_out.h 2003-09-26 11:33:00.000000000 +0200
@@ -18,7 +18,7 @@
typedef struct ao_functions_s
{
ao_info_t *info;
- int (*control)(int cmd,void *arg);
+ long (*control)(int cmd,void *arg);
int (*init)(int rate,int channels,int format,int flags);
void (*uninit)();
void (*reset)();
diff -ur mplayer-1.0pre1.orig/libao2/audio_out_internal.h mplayer-1.0pre1/libao2/audio_out_internal.h
--- mplayer-1.0pre1.orig/libao2/audio_out_internal.h 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/audio_out_internal.h 2003-09-26 11:36:14.000000000 +0200
@@ -1,7 +1,7 @@
// prototypes:
//static ao_info_t info;
-static int control(int cmd, void *arg);
+static long control(int cmd, void *arg);
static int init(int rate,int channels,int format,int flags);
static void uninit();
static void reset();
diff -ur mplayer-1.0pre1.orig/libao2/audio_plugin.h mplayer-1.0pre1/libao2/audio_plugin.h
--- mplayer-1.0pre1.orig/libao2/audio_plugin.h 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/audio_plugin.h 2003-09-26 11:33:13.000000000 +0200
@@ -5,7 +5,7 @@
typedef struct ao_plugin_functions_s
{
ao_info_t *info;
- int (*control)(int cmd, void *arg);
+ long (*control)(int cmd, void *arg);
int (*init)();
void (*uninit)();
void (*reset)();
diff -ur mplayer-1.0pre1.orig/libao2/audio_plugin_internal.h mplayer-1.0pre1/libao2/audio_plugin_internal.h
--- mplayer-1.0pre1.orig/libao2/audio_plugin_internal.h 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/audio_plugin_internal.h 2003-09-26 11:31:40.000000000 +0200
@@ -1,5 +1,5 @@
// prototypes:
-static int control(int cmd, void *arg);
+static long control(int cmd, void *arg);
static int init();
static void uninit();
static void reset();
diff -ur mplayer-1.0pre1.orig/libao2/pl_delay.c mplayer-1.0pre1/libao2/pl_delay.c
--- mplayer-1.0pre1.orig/libao2/pl_delay.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/pl_delay.c 2003-09-26 11:33:36.000000000 +0200
@@ -38,7 +38,7 @@
static pl_delay_t pl_delay={NULL,NULL,0,0,0,0};
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_PLUGIN_SET_LEN:
if(pl_delay.data)
diff -ur mplayer-1.0pre1.orig/libao2/pl_eq.c mplayer-1.0pre1/libao2/pl_eq.c
--- mplayer-1.0pre1.orig/libao2/pl_eq.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/pl_eq.c 2003-09-26 11:34:53.000000000 +0200
@@ -62,7 +62,7 @@
static pl_eq_t pl_eq;
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_PLUGIN_SET_LEN:
return CONTROL_OK;
diff -ur mplayer-1.0pre1.orig/libao2/pl_extrastereo.c mplayer-1.0pre1/libao2/pl_extrastereo.c
--- mplayer-1.0pre1.orig/libao2/pl_extrastereo.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/pl_extrastereo.c 2003-09-26 11:35:25.000000000 +0200
@@ -39,7 +39,7 @@
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_PLUGIN_SET_LEN:
return CONTROL_OK;
diff -ur mplayer-1.0pre1.orig/libao2/pl_format.c mplayer-1.0pre1/libao2/pl_format.c
--- mplayer-1.0pre1.orig/libao2/pl_format.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/pl_format.c 2003-09-26 11:32:36.000000000 +0200
@@ -57,7 +57,7 @@
#define SIGN_MASK (1<<3)
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_PLUGIN_SET_LEN:
if(pl_format.data)
diff -ur mplayer-1.0pre1.orig/libao2/pl_resample.c mplayer-1.0pre1/libao2/pl_resample.c
--- mplayer-1.0pre1.orig/libao2/pl_resample.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/pl_resample.c 2003-09-26 11:32:07.000000000 +0200
@@ -93,7 +93,7 @@
static pl_resample_t pl_resample = {NULL,NULL,1,1,1,0,W};
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_PLUGIN_SET_LEN:
if(pl_resample.data)
diff -ur mplayer-1.0pre1.orig/libao2/pl_surround.c mplayer-1.0pre1/libao2/pl_surround.c
--- mplayer-1.0pre1.orig/libao2/pl_surround.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/pl_surround.c 2003-09-26 11:33:49.000000000 +0200
@@ -79,7 +79,7 @@
static pl_surround_t pl_surround={0,20,NULL,NULL,NULL,0,0,NULL,0,0,0};
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_PLUGIN_SET_LEN:
if (pl_surround.passthrough) return CONTROL_OK;
diff -ur mplayer-1.0pre1.orig/libao2/pl_volnorm.c mplayer-1.0pre1/libao2/pl_volnorm.c
--- mplayer-1.0pre1.orig/libao2/pl_volnorm.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/pl_volnorm.c 2003-09-26 11:36:49.000000000 +0200
@@ -103,7 +103,7 @@
// minimal interface
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_PLUGIN_SET_LEN:
return CONTROL_OK;
diff -ur mplayer-1.0pre1.orig/libao2/pl_volume.c mplayer-1.0pre1/libao2/pl_volume.c
--- mplayer-1.0pre1.orig/libao2/pl_volume.c 2003-03-21 17:42:50.000000000 +0100
+++ mplayer-1.0pre1/libao2/pl_volume.c 2003-09-26 11:34:33.000000000 +0200
@@ -43,7 +43,7 @@
static pl_volume_t pl_volume={0,0,0};
// to set/get/query special features/parameters
-static int control(int cmd,void *arg){
+static long control(int cmd,void *arg){
switch(cmd){
case AOCONTROL_PLUGIN_SET_LEN:
return CONTROL_OK;
diff -ur mplayer-1.0pre1.orig/libavcodec/common.h mplayer-1.0pre1/libavcodec/common.h
--- mplayer-1.0pre1.orig/libavcodec/common.h 2003-09-01 21:58:51.000000000 +0200
+++ mplayer-1.0pre1/libavcodec/common.h 2003-09-26 11:27:23.000000000 +0200
@@ -123,6 +123,8 @@
#define uint64_t_C(c) (c ## ULL)
#endif
+#include "../bswap.h"
+
#ifdef HAVE_AV_CONFIG_H
#ifdef USE_FASTMEMCPY
diff -ur mplayer-1.0pre1.orig/libmpcodecs/dec_audio.c mplayer-1.0pre1/libmpcodecs/dec_audio.c
--- mplayer-1.0pre1.orig/libmpcodecs/dec_audio.c 2003-08-23 00:17:47.000000000 +0200
+++ mplayer-1.0pre1/libmpcodecs/dec_audio.c 2003-09-26 11:27:23.000000000 +0200
@@ -47,6 +47,8 @@
mpcodecs_ad_drivers[i]->info->name);
}
+void uninit_audio(sh_audio_t *sh_audio);
+
int init_audio_codec(sh_audio_t *sh_audio)
{
diff -ur mplayer-1.0pre1.orig/libmpcodecs/vf.c mplayer-1.0pre1/libmpcodecs/vf.c
--- mplayer-1.0pre1.orig/libmpcodecs/vf.c 2003-08-31 23:41:24.000000000 +0200
+++ mplayer-1.0pre1/libmpcodecs/vf.c 2003-09-26 11:27:23.000000000 +0200
@@ -1,6 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <malloc.h>
#include "../config.h"
#ifdef HAVE_MALLOC_H
diff -ur mplayer-1.0pre1.orig/libmpdemux/tvi_v4l.c mplayer-1.0pre1/libmpdemux/tvi_v4l.c
--- mplayer-1.0pre1.orig/libmpdemux/tvi_v4l.c 2003-09-01 14:10:29.000000000 +0200
+++ mplayer-1.0pre1/libmpdemux/tvi_v4l.c 2003-09-26 11:30:38.000000000 +0200
@@ -1010,18 +1010,18 @@
mp_msg(MSGT_TV, MSGL_INFO, " MJP: setting sh_video->format to mjpg\n");
output_fmt = 0x47504a4d;
output_fmt = 0x67706a6d;
- (int)*(void **)arg = output_fmt;
+ *(int *)arg = output_fmt;
mp_msg(MSGT_TV, MSGL_V, "Output format: %s\n", "mjpg");
}
else
{
- (int)*(void **)arg = output_fmt;
+ *(int *)arg = output_fmt;
mp_msg(MSGT_TV, MSGL_V, "Output format: %s\n", vo_format_name(output_fmt));
}
return(TVI_CONTROL_TRUE);
}
case TVI_CONTROL_VID_SET_FORMAT:
- priv->format = (int)*(void **)arg;
+ priv->format = *(int *)arg;
// !HACK! v4l uses BGR format instead of RGB
// and we have to correct this. Fortunately,
// tv.c reads later the format back so we
@@ -1032,17 +1032,17 @@
}
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_GET_PLANES:
- (int)*(void **)arg = 1; /* FIXME, also not needed at this time */
+ *(int *)arg = 1; /* FIXME, also not needed at this time */
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_GET_BITS:
- (int)*(void **)arg = palette2depth(format2palette(priv->format));
+ *(int *)arg = palette2depth(format2palette(priv->format));
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_GET_WIDTH:
- (int)*(void **)arg = priv->width;
+ *(int *)arg = priv->width;
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_CHK_WIDTH:
{
- int req_width = (int)*(void **)arg;
+ int req_width = *(int *)arg;
mp_msg(MSGT_TV, MSGL_V, "Requested width: %d\n", req_width);
if ((req_width >= priv->capability.minwidth) &&
@@ -1051,14 +1051,14 @@
return(TVI_CONTROL_FALSE);
}
case TVI_CONTROL_VID_SET_WIDTH:
- priv->width = (int)*(void **)arg;
+ priv->width = *(int *)arg;
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_GET_HEIGHT:
- (int)*(void **)arg = priv->height;
+ *(int *)arg = priv->height;
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_CHK_HEIGHT:
{
- int req_height = (int)*(void **)arg;
+ int req_height = *(int *)arg;
mp_msg(MSGT_TV, MSGL_V, "Requested height: %d\n", req_height);
if ((req_height >= priv->capability.minheight) &&
@@ -1067,7 +1067,7 @@
return(TVI_CONTROL_FALSE);
}
case TVI_CONTROL_VID_SET_HEIGHT:
- priv->height = (int)*(void **)arg;
+ priv->height = *(int *)arg;
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_GET_PICTURE:
if (ioctl(priv->video_fd, VIDIOCGPICT, &priv->picture) == -1)
@@ -1084,19 +1084,19 @@
}
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_SET_BRIGHTNESS:
- priv->picture.brightness = 65535*((int)*(void **)arg+100)/200;
+ priv->picture.brightness = 65535*(*(int *)arg+100)/200;
control(priv, TVI_CONTROL_VID_SET_PICTURE, 0);
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_SET_HUE:
- priv->picture.hue = 65535*((int)*(void **)arg+100)/200;
+ priv->picture.hue = 65535*(*(int *)arg+100)/200;
control(priv, TVI_CONTROL_VID_SET_PICTURE, 0);
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_SET_SATURATION:
- priv->picture.colour = 65535*((int)*(void **)arg+100)/200;
+ priv->picture.colour = 65535*(*(int *)arg+100)/200;
control(priv, TVI_CONTROL_VID_SET_PICTURE, 0);
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_SET_CONTRAST:
- priv->picture.contrast = poly((int)*(void **)arg, 24576);
+ priv->picture.contrast = poly(*(int *)arg, 24576);
control(priv, TVI_CONTROL_VID_SET_PICTURE, 0);
return(TVI_CONTROL_TRUE);
case TVI_CONTROL_VID_GET_FPS:
@@ -1117,13 +1117,13 @@
/* tuner uses khz not mhz ! */
// if (priv->tuner.flags & VIDEO_TUNER_LOW)
// freq /= 1000;
- (unsigned long)*(void **)arg = freq;
+ *(unsigned long *)arg = freq;
return(TVI_CONTROL_TRUE);
}
case TVI_CONTROL_TUN_SET_FREQ:
{
/* argument is in MHz ! */
- unsigned long freq = (unsigned long)*(void **)arg;
+ unsigned long freq = *(unsigned long *)arg;
if (priv->capability.audios) {
priv->audio[priv->audio_id].volume = 0;
@@ -1175,7 +1175,7 @@
}
case TVI_CONTROL_TUN_SET_NORM:
{
- int req_mode = (int)*(void **)arg;
+ int req_mode = *(int *)arg;
if ((req_mode != TV_NORM_PAL) && (req_mode != TV_NORM_NTSC) && (req_mode != TV_NORM_SECAM)
&& (req_mode != TV_NORM_PALNC) && (req_mode != TV_NORM_PALM) && (req_mode != TV_NORM_PALN)
@@ -1279,7 +1279,7 @@
}
case TVI_CONTROL_TUN_GET_NORM:
{
- (int)*(void **)arg = priv->tuner.mode;
+ *(int *)arg = priv->tuner.mode;
return(TVI_CONTROL_TRUE);
}
@@ -1287,34 +1287,34 @@
/* ========== AUDIO controls =========== */
case TVI_CONTROL_AUD_GET_FORMAT:
{
- (int)*(void **)arg = AFMT_S16_LE;
+ *(int *)arg = AFMT_S16_LE;
return(TVI_CONTROL_TRUE);
}
case TVI_CONTROL_AUD_GET_CHANNELS:
{
- (int)*(void **)arg = priv->audio_in.channels;
+ *(int *)arg = priv->audio_in.channels;
return(TVI_CONTROL_TRUE);
}
case TVI_CONTROL_AUD_GET_SAMPLERATE:
{
- (int)*(void **)arg = priv->audio_in.samplerate;
+ *(int *)arg = priv->audio_in.samplerate;
return(TVI_CONTROL_TRUE);
}
case TVI_CONTROL_AUD_GET_SAMPLESIZE:
{
- (int)*(void **)arg = priv->audio_in.bytes_per_sample;
+ *(int *)arg = priv->audio_in.bytes_per_sample;
return(TVI_CONTROL_TRUE);
}
case TVI_CONTROL_AUD_SET_SAMPLERATE:
{
- if (audio_in_set_samplerate(&priv->audio_in, (int)*(void **)arg) < 0) return TVI_CONTROL_FALSE;
+ if (audio_in_set_samplerate(&priv->audio_in, *(int *)arg) < 0) return TVI_CONTROL_FALSE;
setup_audio_buffer_sizes(priv);
return(TVI_CONTROL_TRUE);
}
/* ========== SPECIFIC controls =========== */
case TVI_CONTROL_SPC_GET_INPUT:
{
- int req_chan = (int)*(void **)arg;
+ int req_chan = *(int *)arg;
int i;
for (i = 0; i < priv->capability.channels; i++)
@@ -1336,7 +1336,7 @@
case TVI_CONTROL_SPC_SET_INPUT:
{
struct video_channel chan;
- int req_chan = (int)*(void **)arg;
+ int req_chan = *(int *)arg;
int i;
if (req_chan >= priv->capability.channels)
diff -ur mplayer-1.0pre1.orig/mplayer.c mplayer-1.0pre1/mplayer.c
--- mplayer-1.0pre1.orig/mplayer.c 2003-08-29 23:41:03.000000000 +0200
+++ mplayer-1.0pre1/mplayer.c 2003-09-26 11:27:23.000000000 +0200
@@ -54,6 +54,8 @@
#include "libao2/audio_out.h"
#include "libao2/audio_plugin.h"
+#include "libmpcodecs/mp_image.h"
+
#include "codec-cfg.h"
#ifdef HAVE_LIBCSS
-------------- next part --------------
--- libmpdvdkit2/libdvdcss.c 2003-08-30 15:38:15.000000000 +0200
+++ libmpdvdkit2/libdvdcss.c 2003-09-26 13:06:53.000000000 +0200
@@ -119,6 +119,8 @@
extern char * get_path( char * filename );
#endif
+extern char *get_path(char *);
+
/**
* \brief Symbol for version checks.
*
--- libvo/vo_xv.c 2003-09-12 17:50:35.000000000 +0200
+++ libvo/vo_xv.c 2003-09-26 13:06:53.000000000 +0200
@@ -364,7 +364,7 @@
}
if ( Shmem_Flag )
{
- xvimage[foo] = (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format, NULL, image_width, image_height, &Shminfo[foo]);
+ xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, NULL, image_width, image_height, &Shminfo[foo]);
Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777);
Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0);
-------------- next part --------------
-------------------------------------------------------------------
Mon Aug 25 08:25:25 CEST 2003 - aj at suse.de
- Add used attributes where needed.
-------------------------------------------------------------------
Sat Aug 16 11:12:00 CEST 2003 - adrian at suse.de
- add desktop file from kappfinder
-------------------------------------------------------------------
Mon Jun 16 16:50:16 CEST 2003 - kukuk at suse.de
- Add /etc/mplayer to filelist
-------------------------------------------------------------------
Thu Apr 17 12:28:49 CEST 2003 - sbrabec at suse.cz
- Fixed XMMS detection.
-------------------------------------------------------------------
Tue Apr 15 18:02:51 CEST 2003 - schwab at suse.de
- Fix another missing declaration.
- Fix sed expression.
-------------------------------------------------------------------
Tue Apr 15 14:05:31 CEST 2003 - sbrabec at suse.cz
- Fixes reported by pthomas at suse.de:
- Define xmms_lib_dir and xmms_plugin_dir.
- Don't fail for non-root build.
-------------------------------------------------------------------
Sun Apr 13 14:03:24 CEST 2003 - schwab at suse.de
- Fix constraint for dcbz insn.
-------------------------------------------------------------------
Wed Apr 9 15:37:43 CEST 2003 - schwab at suse.de
- Fix missing declarations.
-------------------------------------------------------------------
Wed Apr 9 11:35:00 CEST 2003 - schwab at suse.de
- Avoid sdata overflow on ia64.
-------------------------------------------------------------------
Mon Mar 31 18:58:10 CEST 2003 - sbrabec at suse.cz
- Added xmms-devel to neededforbuild.
-------------------------------------------------------------------
Tue Mar 25 16:52:01 CET 2003 - sbrabec at suse.cz
- Marked mp-luxi-iso-8859-1.zip as distributable.
-------------------------------------------------------------------
Tue Mar 25 16:33:45 CET 2003 - sbrabec at suse.cz
- Config files moved to /etc/mplayer to keep /etc a bit cleaner (bug
#25818).
-------------------------------------------------------------------
Tue Mar 18 17:11:54 CET 2003 - sbrabec at suse.cz
- Use x11 video output, if xv fails (MPlayer-conf.patch, fixes bug
#25514).
-------------------------------------------------------------------
Wed Mar 12 17:48:12 CET 2003 - sbrabec at suse.cz
- Added Luxi font for ISO-8859-2 (provided by szenti at suselinux.hu).
-------------------------------------------------------------------
Tue Mar 11 18:30:40 CET 2003 - sbrabec at suse.cz
- Updated cripple patch (text supplied by legal counsel, GUI message).
-------------------------------------------------------------------
Thu Feb 20 18:03:59 CET 2003 - sbrabec at suse.cz
- Disabled VIDIX support in distributable version due to uncertain legal
status of Direct Hardware Access.
- Note on crippled version in banner text.
-------------------------------------------------------------------
Sat Feb 15 17:29:05 CET 2003 - stepan at suse.de
- fix (obsolete) dvdnav support to compile with
a recent libdvdnav
-------------------------------------------------------------------
Thu Feb 13 17:50:01 CET 2003 - sbrabec at suse.cz
- Fixed xmms paths for biarch.
-------------------------------------------------------------------
Thu Feb 13 15:32:17 CET 2003 - sbrabec at suse.cz
- Update MPlayer to version 0.90rc4.
- Updated live to version 2003.02.10.
- Updated w32codec to version 0.90pre7.
- Updated cripple patch.
-------------------------------------------------------------------
Fri Feb 07 16:31:58 CET 2003 - sbrabec at suse.cz
- Update MPlayer to version 0.90rc3.
- Updated live to version 2003.02.06a.
- Updated cripple patch.
- Enabled support for xmms input plugins.
- Disable runtime cpudetection for undistributable package.
- Re-enabled ffmpeg in undistributable version.
- Updated ffmpeg to version 0.4.6.
- Automatically generate warning in README.SuSE, if gcc version is not
oficially supported.
-------------------------------------------------------------------
Fri Feb 7 12:36:58 CET 2003 - ro at suse.de
- DirectFB-0.9.16 changed DSPF_RGB15 to DSPF_ARGB1555
-------------------------------------------------------------------
Thu Jan 30 18:44:03 MET 2003 - draht at suse.de
- MPlayer-0.90pre9-tempfile-unrarlib.diff added so that debug file
is opened and created in $HOME, not /tmp, which is unwise for
security reasons.
-------------------------------------------------------------------
Mon Jan 27 00:37:23 CET 2003 - ro at suse.de
- fix gcc-3.3 build
-------------------------------------------------------------------
Tue Oct 29 12:58:36 CET 2002 - uli at suse.de
- update -> 0.90pre9
- use dvdnav from external package
- dump sdldefault (broken by internal restructuring)
- dump gmplayer script (broken by removal of -gui option)
-------------------------------------------------------------------
Fri Sep 20 11:53:01 CEST 2002 - uli at suse.de
- update -> 0.90pre8
- GUI works perfectly fine with x11 output
-------------------------------------------------------------------
Fri Sep 13 21:38:46 CEST 2002 - adrian at suse.de
- let mplayer really work on non-xv displays (do not use -gui)
-------------------------------------------------------------------
Thu Sep 12 14:12:23 CEST 2002 - uli at suse.de
- it's "xvinfo", not "xvideo"
- due to the new SDL default Xvideo has to be chosen explicitly
when calling the GUI version
-------------------------------------------------------------------
Mon Aug 26 14:55:22 CEST 2002 - uli at suse.de
- added default *.conf files
-------------------------------------------------------------------
Wed Aug 21 19:39:36 CEST 2002 - uli at suse.de
- made SDL default for command-line player (defaults to Xv with
fallback)
- replaced gmplayer link with wrapper script detecting presence
of XVideo
- fixed segfault in GUI when OSD font is present
- replaced Arial with distributable font
- reenabled a severely crippled (no AC3, MPEG-4, SVQ1) ffmpeg,
regaining ffmjpeg and thus the Zoran output driver
- changed the absence of codecs in libavcodec from error to warning
- I am getting to the point where I feel uncomfortable signing
these changelog entries with my name.
-------------------------------------------------------------------
Wed Aug 21 14:42:58 CEST 2002 - uli at suse.de
- -O4 breaks Win32 DLL loading; using whatever RPM_OPT_FLAGS says
- disabled native MPEG-4 by deleting ffmpeg in distributable build
(catches a few other codecs and the Zoran output driver as well,
unfortunately)
- disabled SVQ1 codec in distributable build
- added script searching for Win32 codecs
- added README.SuSE similar to the one from avifile
-------------------------------------------------------------------
Wed Aug 7 11:15:30 CEST 2002 - uli at suse.de
- ditched xvid support, encoding is broken
-------------------------------------------------------------------
Tue Aug 6 17:04:31 CEST 2002 - uli at suse.de
- update -> 0.90pre6:
libavcodec M1 direct rendering, IPB support with Xv
libavcodec improvements, bugfixes - both encoder & decoder side
Raw DV demuxer, libdv-based DV audio/video decoder
Various MOV/MP4, RM and ASF/WMV demuxer bugfixes, improvements
Detection of AVI files which needs -ni, workaround for some Nandub bugs
Support for live.com RTP/RTSP streaming libraries
Support to rip DVD subs in VobSub format, bugfixes of mpsub/srt converter
Closed Captioning (ascii subs on RC1 DVDs) support
Massive directfb updates
Vidix fixes/updates, including fixes of all known radeon bugs
AO: alsa9 fixes/improvements, native ARTS driver
various endianess and 64-bit fixes, including mencoder and -ao pcm
GUI fixes, new features - playlist, audio/video equalizer, preferences
Skins: fixed many small glitches, few new skins
html DOCS updates, manpage & README restructured (again :))
-------------------------------------------------------------------
Wed Jul 10 14:56:54 CEST 2002 - uli at suse.de
- update -> 20020709 (native SVQ1 codec, can use RealPlayer codecs,
and if we didn't suck and still had SVGALib it would even support
EGA cards...)
-------------------------------------------------------------------
Fri Jul 5 10:06:17 CEST 2002 - kukuk at suse.de
- Use %ix86 macro
-------------------------------------------------------------------
Tue Jun 25 12:30:44 CEST 2002 - uli at suse.de
- fixed directory permissions
-------------------------------------------------------------------
Mon Jun 10 11:58:12 CEST 2002 - uli at suse.de
- update -> 0.90pre5
-------------------------------------------------------------------
Fri May 31 15:57:22 CEST 2002 - ro at suse.de
- changed neededforbuild <slang> to <slang slang-devel>
-------------------------------------------------------------------
Thu May 23 14:39:23 CEST 2002 - uli at suse.de
- update -> 20020523
-------------------------------------------------------------------
Tue May 21 15:45:06 CEST 2002 - uli at suse.de
- fixed to build on x86-64 & s390x
-------------------------------------------------------------------
Sat May 18 01:14:12 CEST 2002 - schwab at suse.de
- Fix missing declarations.
- Fix conflicting types.
-------------------------------------------------------------------
Tue May 14 14:08:21 CEST 2002 - uli at suse.de
- update -> 0.90-pre4
-------------------------------------------------------------------
Mon May 6 18:34:53 CEST 2002 - uli at suse.de
- update -> 0.90-pre3
-------------------------------------------------------------------
Tue Apr 30 17:14:18 CEST 2002 - uli at suse.de
- package completely redone, version 0.90-pre2
-------------------------------------------------------------------
Sat Mar 23 01:54:59 CET 2002 - bk at suse.de
- set win32codecdir, autodetect fails in build
-------------------------------------------------------------------
Wed Feb 6 23:19:00 CET 2002 - ro at suse.de
- fixed Makefile for DESTDIR and make install with DESTDIR
- call make in build-section
-------------------------------------------------------------------
Wed Feb 6 19:00:29 CET 2002 - egmont at suselinux.hu
- take maintenance from bk
- new package (0.60) created from scratch
-------------------------------------------------------------------
Wed Jan 23 00:16:33 CET 2002 - ro at suse.de
- use shortcuts in neededforbuild
-------------------------------------------------------------------
Thu Nov 15 00:55:07 CET 2001 - ro at suse.de
- ignore failure when removing non-existant docs
-------------------------------------------------------------------
Sat Aug 18 02:17:47 CEST 2001 - bk at suse.de
- libac3 is removed in the build and the tarball is repackaged
- set video out(max flexibility) and audio out(for arts/KDE) to SDL
- only for x86
-------------- next part --------------
diff -ur mplayer-1.0pre1.orig/libavcodec/libpostproc/postprocess.c mplayer-1.0pre1/libavcodec/libpostproc/postprocess.c
--- mplayer-1.0pre1.orig/libavcodec/libpostproc/postprocess.c 2003-09-01 21:58:51.000000000 +0200
+++ mplayer-1.0pre1/libavcodec/libpostproc/postprocess.c 2003-09-25 17:15:55.000000000 +0200
@@ -104,13 +104,13 @@
//#define NUM_BLOCKS_AT_ONCE 16 //not used yet
#ifdef ARCH_X86
-static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL;
-static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL;
-static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL;
-static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL;
-static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL;
-static uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL;
-static uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL;
+static uint64_t __attribute__((aligned(8),used)) w05= 0x0005000500050005LL;
+static uint64_t __attribute__((aligned(8),used)) w20= 0x0020002000200020LL;
+static uint64_t __attribute__((aligned(8),used)) b00= 0x0000000000000000LL;
+static uint64_t __attribute__((aligned(8),used)) b01= 0x0101010101010101LL;
+static uint64_t __attribute__((aligned(8),used)) b02= 0x0202020202020202LL;
+static uint64_t __attribute__((aligned(8),used)) b08= 0x0808080808080808LL;
+static uint64_t __attribute__((aligned(8),used)) b80= 0x8080808080808080LL;
#endif
@@ -119,7 +119,7 @@
static int verbose= 0;
-static const int deringThreshold= 20;
+static const int deringThreshold __attribute__((used))= 20;
static struct PPFilter filters[]=
diff -ur mplayer-1.0pre1.orig/liba52/imdct.c mplayer-1.0pre1/liba52/imdct.c
--- mplayer-1.0pre1.orig/liba52/imdct.c 2003-01-27 22:47:24.000000000 +0100
+++ mplayer-1.0pre1/liba52/imdct.c 2003-09-25 17:08:21.000000000 +0200
@@ -749,9 +749,9 @@
#endif
#include "srfftp_3dnow.h"
-const i_cmplx_t x_plus_minus_3dnow __attribute__ ((aligned (8))) = {{ 0x00000000UL, 0x80000000UL }};
-const i_cmplx_t x_minus_plus_3dnow __attribute__ ((aligned (8))) = {{ 0x80000000UL, 0x00000000UL }};
-const complex_t HSQRT2_3DNOW __attribute__ ((aligned (8))) = { 0.707106781188, 0.707106781188 };
+const i_cmplx_t x_plus_minus_3dnow __attribute__ ((aligned (8),used)) = {{ 0x00000000UL, 0x80000000UL }};
+const i_cmplx_t x_minus_plus_3dnow __attribute__ ((aligned (8),used)) = {{ 0x80000000UL, 0x00000000UL }};
+const complex_t HSQRT2_3DNOW __attribute__ ((aligned (8),used)) = { 0.707106781188, 0.707106781188 };
#undef HAVE_3DNOWEX
#include "imdct_3dnow.h"
diff -ur mplayer-1.0pre1.orig/libvo/osd.c mplayer-1.0pre1/libvo/osd.c
--- mplayer-1.0pre1.orig/libvo/osd.c 2003-08-03 20:33:28.000000000 +0200
+++ mplayer-1.0pre1/libvo/osd.c 2003-09-25 17:08:21.000000000 +0200
@@ -19,9 +19,9 @@
#endif
#ifdef CAN_COMPILE_X86_ASM
-static const uint64_t bFF __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
-static const unsigned long long mask24lh __attribute__((aligned(8))) = 0xFFFF000000000000ULL;
-static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FFFFFFFFFFFFULL;
+static const uint64_t bFF __attribute__((aligned(8),used)) = 0xFFFFFFFFFFFFFFFFULL;
+static const unsigned long long mask24lh __attribute__((aligned(8),used)) = 0xFFFF000000000000ULL;
+static const unsigned long long mask24hl __attribute__((aligned(8),used)) = 0x0000FFFFFFFFFFFFULL;
#endif
//Note: we have C, X86-nommx, MMX, MMX2, 3DNOW version therse no 3DNOW+MMX2 one
diff -ur mplayer-1.0pre1.orig/mp3lib/dct64_k7.c mplayer-1.0pre1/mp3lib/dct64_k7.c
--- mplayer-1.0pre1.orig/mp3lib/dct64_k7.c 2003-01-19 22:50:50.000000000 +0100
+++ mplayer-1.0pre1/mp3lib/dct64_k7.c 2003-09-25 17:08:21.000000000 +0200
@@ -11,8 +11,8 @@
#include "../mangle.h"
-static unsigned long long int __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
-static float plus_1f = 1.0;
+static unsigned long long int __attribute__((aligned(8),used)) x_plus_minus_3dnow = 0x8000000000000000ULL;
+static float plus_1f __attribute__ ((used)) = 1.0;
void __attribute__ (( __stdcall__ )) dct64_MMX_3dnowex(real *a,real *b,real *c)
{
diff -ur mplayer-1.0pre1.orig/mp3lib/dct64_3dnow.c mplayer-1.0pre1/mp3lib/dct64_3dnow.c
--- mplayer-1.0pre1.orig/mp3lib/dct64_3dnow.c 2002-11-20 00:35:51.000000000 +0100
+++ mplayer-1.0pre1/mp3lib/dct64_3dnow.c 2003-09-25 17:08:21.000000000 +0200
@@ -11,8 +11,8 @@
#include "../mangle.h"
-static unsigned long long int __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
-static float plus_1f = 1.0;
+static unsigned long long int __attribute__((aligned(8),used)) x_plus_minus_3dnow = 0x8000000000000000ULL;
+static float plus_1f __attribute__ ((used)) = 1.0;
void __attribute__ (( __stdcall__ )) dct64_MMX_3dnow(real *a,real *b,real *c)
{
diff -ur mplayer-1.0pre1.orig/mp3lib/decode_i586.c mplayer-1.0pre1/mp3lib/decode_i586.c
--- mplayer-1.0pre1.orig/mp3lib/decode_i586.c 2002-12-24 23:33:46.000000000 +0100
+++ mplayer-1.0pre1/mp3lib/decode_i586.c 2003-09-25 17:08:21.000000000 +0200
@@ -27,7 +27,7 @@
#define real float /* ugly - but only way */
static long buffs[1088];
-static long bo=1;
+static long __attribute__ ((used)) bo=1;
static long saved_ebp;
int synth_1to1_pent(real *bandPtr, int channel, short *samples)
diff -ur mplayer-1.0pre1.orig/mp3lib/decode_MMX.c mplayer-1.0pre1/mp3lib/decode_MMX.c
--- mplayer-1.0pre1.orig/mp3lib/decode_MMX.c 2002-12-24 23:33:46.000000000 +0100
+++ mplayer-1.0pre1/mp3lib/decode_MMX.c 2003-09-25 17:08:21.000000000 +0200
@@ -10,9 +10,9 @@
#include "../mangle.h"
#define real float /* ugly - but only way */
-static unsigned long long __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;
-static unsigned long long __attribute__((aligned(8))) one_null = 0xffff0000ffff0000ULL;
-unsigned long __attribute__((aligned(8))) costab_mmx[] =
+static unsigned long long __attribute__((aligned(8),used)) null_one = 0x0000ffff0000ffffULL;
+static unsigned long long __attribute__((aligned(8),used)) one_null = 0xffff0000ffff0000ULL;
+unsigned long __attribute__((aligned(8),used)) costab_mmx[] =
{
1056974725,
1057056395,
diff -ur mplayer-1.0pre1.orig/mp3lib/tabinit_MMX.c mplayer-1.0pre1/mp3lib/tabinit_MMX.c
--- mplayer-1.0pre1.orig/mp3lib/tabinit_MMX.c 2002-12-24 23:33:46.000000000 +0100
+++ mplayer-1.0pre1/mp3lib/tabinit_MMX.c 2003-09-25 17:08:21.000000000 +0200
@@ -48,7 +48,7 @@
15038
};
-static long intwindiv = 0x47800000;
+static long intwindiv __attribute__ ((used)) = 0x47800000;
void make_decode_tables_MMX(long scaleval)
{
diff -ur mplayer-1.0pre1.orig/postproc/rgb2rgb.c mplayer-1.0pre1/postproc/rgb2rgb.c
--- mplayer-1.0pre1.orig/postproc/rgb2rgb.c 2003-04-25 19:16:55.000000000 +0200
+++ mplayer-1.0pre1/postproc/rgb2rgb.c 2003-09-25 17:19:27.000000000 +0200
@@ -66,64 +66,64 @@
int srcStride3, int dstStride);
#ifdef ARCH_X86
-static const uint64_t mmx_null __attribute__((aligned(8))) = 0x0000000000000000ULL;
-static const uint64_t mmx_one __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
-static const uint64_t mask32b __attribute__((aligned(8))) = 0x000000FF000000FFULL;
-static const uint64_t mask32g __attribute__((aligned(8))) = 0x0000FF000000FF00ULL;
-static const uint64_t mask32r __attribute__((aligned(8))) = 0x00FF000000FF0000ULL;
-static const uint64_t mask32 __attribute__((aligned(8))) = 0x00FFFFFF00FFFFFFULL;
-static const uint64_t mask3216br __attribute__((aligned(8)))=0x00F800F800F800F8ULL;
-static const uint64_t mask3216g __attribute__((aligned(8)))=0x0000FC000000FC00ULL;
-static const uint64_t mask3215g __attribute__((aligned(8)))=0x0000F8000000F800ULL;
-static const uint64_t mul3216 __attribute__((aligned(8))) = 0x2000000420000004ULL;
-static const uint64_t mul3215 __attribute__((aligned(8))) = 0x2000000820000008ULL;
-static const uint64_t mask24b __attribute__((aligned(8))) = 0x00FF0000FF0000FFULL;
-static const uint64_t mask24g __attribute__((aligned(8))) = 0xFF0000FF0000FF00ULL;
-static const uint64_t mask24r __attribute__((aligned(8))) = 0x0000FF0000FF0000ULL;
-static const uint64_t mask24l __attribute__((aligned(8))) = 0x0000000000FFFFFFULL;
-static const uint64_t mask24h __attribute__((aligned(8))) = 0x0000FFFFFF000000ULL;
-static const uint64_t mask24hh __attribute__((aligned(8))) = 0xffff000000000000ULL;
-static const uint64_t mask24hhh __attribute__((aligned(8))) = 0xffffffff00000000ULL;
-static const uint64_t mask24hhhh __attribute__((aligned(8))) = 0xffffffffffff0000ULL;
-static const uint64_t mask15b __attribute__((aligned(8))) = 0x001F001F001F001FULL; /* 00000000 00011111 xxB */
-static const uint64_t mask15rg __attribute__((aligned(8))) = 0x7FE07FE07FE07FE0ULL; /* 01111111 11100000 RGx */
-static const uint64_t mask15s __attribute__((aligned(8))) = 0xFFE0FFE0FFE0FFE0ULL;
-static const uint64_t mask15g __attribute__((aligned(8))) = 0x03E003E003E003E0ULL;
-static const uint64_t mask15r __attribute__((aligned(8))) = 0x7C007C007C007C00ULL;
+static const uint64_t mmx_null __attribute__((aligned(8),used)) = 0x0000000000000000ULL;
+static const uint64_t mmx_one __attribute__((aligned(8),used)) = 0xFFFFFFFFFFFFFFFFULL;
+static const uint64_t mask32b __attribute__((aligned(8),used)) = 0x000000FF000000FFULL;
+static const uint64_t mask32g __attribute__((aligned(8),used)) = 0x0000FF000000FF00ULL;
+static const uint64_t mask32r __attribute__((aligned(8),used)) = 0x00FF000000FF0000ULL;
+static const uint64_t mask32 __attribute__((aligned(8),used)) = 0x00FFFFFF00FFFFFFULL;
+static const uint64_t mask3216br __attribute__((aligned(8),used))=0x00F800F800F800F8ULL;
+static const uint64_t mask3216g __attribute__((aligned(8),used))=0x0000FC000000FC00ULL;
+static const uint64_t mask3215g __attribute__((aligned(8),used))=0x0000F8000000F800ULL;
+static const uint64_t mul3216 __attribute__((aligned(8),used)) = 0x2000000420000004ULL;
+static const uint64_t mul3215 __attribute__((aligned(8),used)) = 0x2000000820000008ULL;
+static const uint64_t mask24b __attribute__((aligned(8),used)) = 0x00FF0000FF0000FFULL;
+static const uint64_t mask24g __attribute__((aligned(8),used)) = 0xFF0000FF0000FF00ULL;
+static const uint64_t mask24r __attribute__((aligned(8),used)) = 0x0000FF0000FF0000ULL;
+static const uint64_t mask24l __attribute__((aligned(8),used)) = 0x0000000000FFFFFFULL;
+static const uint64_t mask24h __attribute__((aligned(8),used)) = 0x0000FFFFFF000000ULL;
+static const uint64_t mask24hh __attribute__((aligned(8),used)) = 0xffff000000000000ULL;
+static const uint64_t mask24hhh __attribute__((aligned(8),used)) = 0xffffffff00000000ULL;
+static const uint64_t mask24hhhh __attribute__((aligned(8),used)) = 0xffffffffffff0000ULL;
+static const uint64_t mask15b __attribute__((aligned(8),used)) = 0x001F001F001F001FULL; /* 00000000 00011111 xxB */
+static const uint64_t mask15rg __attribute__((aligned(8),used)) = 0x7FE07FE07FE07FE0ULL; /* 01111111 11100000 RGx */
+static const uint64_t mask15s __attribute__((aligned(8),used)) = 0xFFE0FFE0FFE0FFE0ULL;
+static const uint64_t mask15g __attribute__((aligned(8),used)) = 0x03E003E003E003E0ULL;
+static const uint64_t mask15r __attribute__((aligned(8),used)) = 0x7C007C007C007C00ULL;
#define mask16b mask15b
-static const uint64_t mask16g __attribute__((aligned(8))) = 0x07E007E007E007E0ULL;
-static const uint64_t mask16r __attribute__((aligned(8))) = 0xF800F800F800F800ULL;
-static const uint64_t red_16mask __attribute__((aligned(8))) = 0x0000f8000000f800ULL;
-static const uint64_t green_16mask __attribute__((aligned(8)))= 0x000007e0000007e0ULL;
-static const uint64_t blue_16mask __attribute__((aligned(8))) = 0x0000001f0000001fULL;
-static const uint64_t red_15mask __attribute__((aligned(8))) = 0x00007c000000f800ULL;
-static const uint64_t green_15mask __attribute__((aligned(8)))= 0x000003e0000007e0ULL;
-static const uint64_t blue_15mask __attribute__((aligned(8))) = 0x0000001f0000001fULL;
+static const uint64_t mask16g __attribute__((aligned(8),used)) = 0x07E007E007E007E0ULL;
+static const uint64_t mask16r __attribute__((aligned(8),used)) = 0xF800F800F800F800ULL;
+static const uint64_t red_16mask __attribute__((aligned(8),used)) = 0x0000f8000000f800ULL;
+static const uint64_t green_16mask __attribute__((aligned(8),used))= 0x000007e0000007e0ULL;
+static const uint64_t blue_16mask __attribute__((aligned(8),used)) = 0x0000001f0000001fULL;
+static const uint64_t red_15mask __attribute__((aligned(8),used)) = 0x00007c000000f800ULL;
+static const uint64_t green_15mask __attribute__((aligned(8),used))= 0x000003e0000007e0ULL;
+static const uint64_t blue_15mask __attribute__((aligned(8),used)) = 0x0000001f0000001fULL;
#ifdef FAST_BGR2YV12
-static const uint64_t bgr2YCoeff __attribute__((aligned(8))) = 0x000000210041000DULL;
-static const uint64_t bgr2UCoeff __attribute__((aligned(8))) = 0x0000FFEEFFDC0038ULL;
-static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00000038FFD2FFF8ULL;
+static const uint64_t bgr2YCoeff __attribute__((aligned(8),used)) = 0x000000210041000DULL;
+static const uint64_t bgr2UCoeff __attribute__((aligned(8),used)) = 0x0000FFEEFFDC0038ULL;
+static const uint64_t bgr2VCoeff __attribute__((aligned(8),used)) = 0x00000038FFD2FFF8ULL;
#else
-static const uint64_t bgr2YCoeff __attribute__((aligned(8))) = 0x000020E540830C8BULL;
-static const uint64_t bgr2UCoeff __attribute__((aligned(8))) = 0x0000ED0FDAC23831ULL;
-static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00003831D0E6F6EAULL;
+static const uint64_t bgr2YCoeff __attribute__((aligned(8),used)) = 0x000020E540830C8BULL;
+static const uint64_t bgr2UCoeff __attribute__((aligned(8),used)) = 0x0000ED0FDAC23831ULL;
+static const uint64_t bgr2VCoeff __attribute__((aligned(8),used)) = 0x00003831D0E6F6EAULL;
#endif
-static const uint64_t bgr2YOffset __attribute__((aligned(8))) = 0x1010101010101010ULL;
-static const uint64_t bgr2UVOffset __attribute__((aligned(8)))= 0x8080808080808080ULL;
-static const uint64_t w1111 __attribute__((aligned(8))) = 0x0001000100010001ULL;
+static const uint64_t bgr2YOffset __attribute__((aligned(8),used)) = 0x1010101010101010ULL;
+static const uint64_t bgr2UVOffset __attribute__((aligned(8),used))= 0x8080808080808080ULL;
+static const uint64_t w1111 __attribute__((aligned(8),used)) = 0x0001000100010001ULL;
#if 0
-static volatile uint64_t __attribute__((aligned(8))) b5Dither;
-static volatile uint64_t __attribute__((aligned(8))) g5Dither;
-static volatile uint64_t __attribute__((aligned(8))) g6Dither;
-static volatile uint64_t __attribute__((aligned(8))) r5Dither;
+static volatile uint64_t __attribute__((aligned(8),used)) b5Dither;
+static volatile uint64_t __attribute__((aligned(8),used)) g5Dither;
+static volatile uint64_t __attribute__((aligned(8),used)) g6Dither;
+static volatile uint64_t __attribute__((aligned(8),used)) r5Dither;
-static uint64_t __attribute__((aligned(8))) dither4[2]={
+static uint64_t __attribute__((aligned(8),used)) dither4[2]={
0x0103010301030103LL,
0x0200020002000200LL,};
-static uint64_t __attribute__((aligned(8))) dither8[2]={
+static uint64_t __attribute__((aligned(8),used)) dither8[2]={
0x0602060206020602LL,
0x0004000400040004LL,};
#endif
diff -ur mplayer-1.0pre1.orig/postproc/swscale.c mplayer-1.0pre1/postproc/swscale.c
--- mplayer-1.0pre1.orig/postproc/swscale.c 2003-06-19 23:28:56.000000000 +0200
+++ mplayer-1.0pre1/postproc/swscale.c 2003-09-25 17:18:03.000000000 +0200
@@ -146,51 +146,51 @@
#define MAX(a,b) ((a) < (b) ? (b) : (a))
#ifdef ARCH_X86
-static uint64_t __attribute__((aligned(8))) bF8= 0xF8F8F8F8F8F8F8F8LL;
-static uint64_t __attribute__((aligned(8))) bFC= 0xFCFCFCFCFCFCFCFCLL;
-static uint64_t __attribute__((aligned(8))) w10= 0x0010001000100010LL;
-static uint64_t __attribute__((aligned(8))) w02= 0x0002000200020002LL;
-static uint64_t __attribute__((aligned(8))) bm00001111=0x00000000FFFFFFFFLL;
-static uint64_t __attribute__((aligned(8))) bm00000111=0x0000000000FFFFFFLL;
-static uint64_t __attribute__((aligned(8))) bm11111000=0xFFFFFFFFFF000000LL;
-static uint64_t __attribute__((aligned(8))) bm01010101=0x00FF00FF00FF00FFLL;
+static uint64_t __attribute__((aligned(8),used)) bF8= 0xF8F8F8F8F8F8F8F8LL;
+static uint64_t __attribute__((aligned(8),used)) bFC= 0xFCFCFCFCFCFCFCFCLL;
+static uint64_t __attribute__((aligned(8),used)) w10= 0x0010001000100010LL;
+static uint64_t __attribute__((aligned(8),used)) w02= 0x0002000200020002LL;
+static uint64_t __attribute__((aligned(8),used)) bm00001111=0x00000000FFFFFFFFLL;
+static uint64_t __attribute__((aligned(8),used)) bm00000111=0x0000000000FFFFFFLL;
+static uint64_t __attribute__((aligned(8),used)) bm11111000=0xFFFFFFFFFF000000LL;
+static uint64_t __attribute__((aligned(8),used)) bm01010101=0x00FF00FF00FF00FFLL;
static volatile uint64_t __attribute__((aligned(8))) b5Dither;
static volatile uint64_t __attribute__((aligned(8))) g5Dither;
static volatile uint64_t __attribute__((aligned(8))) g6Dither;
static volatile uint64_t __attribute__((aligned(8))) r5Dither;
-static uint64_t __attribute__((aligned(8))) dither4[2]={
+static uint64_t __attribute__((aligned(8),used)) dither4[2]={
0x0103010301030103LL,
0x0200020002000200LL,};
-static uint64_t __attribute__((aligned(8))) dither8[2]={
+static uint64_t __attribute__((aligned(8),used)) dither8[2]={
0x0602060206020602LL,
0x0004000400040004LL,};
-static uint64_t __attribute__((aligned(8))) b16Mask= 0x001F001F001F001FLL;
-static uint64_t __attribute__((aligned(8))) g16Mask= 0x07E007E007E007E0LL;
-static uint64_t __attribute__((aligned(8))) r16Mask= 0xF800F800F800F800LL;
-static uint64_t __attribute__((aligned(8))) b15Mask= 0x001F001F001F001FLL;
-static uint64_t __attribute__((aligned(8))) g15Mask= 0x03E003E003E003E0LL;
-static uint64_t __attribute__((aligned(8))) r15Mask= 0x7C007C007C007C00LL;
-
-static uint64_t __attribute__((aligned(8))) M24A= 0x00FF0000FF0000FFLL;
-static uint64_t __attribute__((aligned(8))) M24B= 0xFF0000FF0000FF00LL;
-static uint64_t __attribute__((aligned(8))) M24C= 0x0000FF0000FF0000LL;
+static uint64_t __attribute__((aligned(8),used)) b16Mask= 0x001F001F001F001FLL;
+static uint64_t __attribute__((aligned(8),used)) g16Mask= 0x07E007E007E007E0LL;
+static uint64_t __attribute__((aligned(8),used)) r16Mask= 0xF800F800F800F800LL;
+static uint64_t __attribute__((aligned(8),used)) b15Mask= 0x001F001F001F001FLL;
+static uint64_t __attribute__((aligned(8),used)) g15Mask= 0x03E003E003E003E0LL;
+static uint64_t __attribute__((aligned(8),used)) r15Mask= 0x7C007C007C007C00LL;
+
+static uint64_t __attribute__((aligned(8),used)) M24A= 0x00FF0000FF0000FFLL;
+static uint64_t __attribute__((aligned(8),used)) M24B= 0xFF0000FF0000FF00LL;
+static uint64_t __attribute__((aligned(8),used)) M24C= 0x0000FF0000FF0000LL;
#ifdef FAST_BGR2YV12
-static const uint64_t bgr2YCoeff __attribute__((aligned(8))) = 0x000000210041000DULL;
-static const uint64_t bgr2UCoeff __attribute__((aligned(8))) = 0x0000FFEEFFDC0038ULL;
-static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00000038FFD2FFF8ULL;
+static const uint64_t bgr2YCoeff __attribute__((aligned(8),used)) = 0x000000210041000DULL;
+static const uint64_t bgr2UCoeff __attribute__((aligned(8),used)) = 0x0000FFEEFFDC0038ULL;
+static const uint64_t bgr2VCoeff __attribute__((aligned(8),used)) = 0x00000038FFD2FFF8ULL;
#else
-static const uint64_t bgr2YCoeff __attribute__((aligned(8))) = 0x000020E540830C8BULL;
-static const uint64_t bgr2UCoeff __attribute__((aligned(8))) = 0x0000ED0FDAC23831ULL;
-static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00003831D0E6F6EAULL;
+static const uint64_t bgr2YCoeff __attribute__((aligned(8),used)) = 0x000020E540830C8BULL;
+static const uint64_t bgr2UCoeff __attribute__((aligned(8),used)) = 0x0000ED0FDAC23831ULL;
+static const uint64_t bgr2VCoeff __attribute__((aligned(8),used)) = 0x00003831D0E6F6EAULL;
#endif
-static const uint64_t bgr2YOffset __attribute__((aligned(8))) = 0x1010101010101010ULL;
-static const uint64_t bgr2UVOffset __attribute__((aligned(8)))= 0x8080808080808080ULL;
-static const uint64_t w1111 __attribute__((aligned(8))) = 0x0001000100010001ULL;
+static const uint64_t bgr2YOffset __attribute__((aligned(8),used)) = 0x1010101010101010ULL;
+static const uint64_t bgr2UVOffset __attribute__((aligned(8),used))= 0x8080808080808080ULL;
+static const uint64_t w1111 __attribute__((aligned(8),used)) = 0x0001000100010001ULL;
#endif
// clipping helper table for C implementations:
-------------- next part --------------
Binärdateien MPlayer-0.90rc4.orig/cpudetect.o and MPlayer-0.90rc4/cpudetect.o sind verschieden.
diff -urN MPlayer-0.90rc4.orig/libmpdemux/dvdnav_stream.h MPlayer-0.90rc4/libmpdemux/dvdnav_stream.h
--- MPlayer-0.90rc4.orig/libmpdemux/dvdnav_stream.h 2002-04-03 19:50:48.000000000 +0200
+++ MPlayer-0.90rc4/libmpdemux/dvdnav_stream.h 2003-02-15 17:08:15.000000000 +0100
@@ -11,6 +11,7 @@
typedef struct {
dvdnav_t * dvdnav; /* handle to libdvdnav stuff */
+ pci_t * current_pci; /* PCI */
char * filename; /* path */
int ignore_timers; /* should timers be skipped? */
int sleeping; /* are we sleeping? */
Binärdateien MPlayer-0.90rc4.orig/mp_msg.o and MPlayer-0.90rc4/mp_msg.o sind verschieden.
diff -urN MPlayer-0.90rc4.orig/mplayer.c MPlayer-0.90rc4/mplayer.c
--- MPlayer-0.90rc4.orig/mplayer.c 2003-02-09 14:17:12.000000000 +0100
+++ MPlayer-0.90rc4/mplayer.c 2003-02-15 17:15:59.000000000 +0100
@@ -2930,7 +2930,10 @@
break;
}
case DVDNAV_NAV_PACKET: {
- // printf("DVDNAV Event: Nav Packet\n");
+#ifndef DVDNAV_OLDAPI
+ printf("DVDNAV Event: Nav Packet\n");
+ dvdnav_priv->current_pci = dvdnav_get_current_nav_pci(dvdnav_priv->dvdnav);
+#endif
break;
}
case DVDNAV_SPU_CLUT_CHANGE: {
@@ -2961,23 +2964,48 @@
switch (cmd->args[0].v.i) {
case MP_CMD_DVDNAV_UP:
- dvdnav_upper_button_select(dvdnav_priv->dvdnav);
+#ifndef DVDNAV_OLDAPI
+ if (dvdnav_priv->current_pci)
+ dvdnav_upper_button_select(dvdnav_priv->dvdnav, dvdnav_priv->current_pci);
+#else
+ dvdnav_upper_button_select(dvdnav_priv->dvdnav);
+#endif
break;
case MP_CMD_DVDNAV_DOWN:
- dvdnav_lower_button_select(dvdnav_priv->dvdnav);
+#ifndef DVDNAV_OLDAPI
+ if (dvdnav_priv->current_pci)
+ dvdnav_lower_button_select(dvdnav_priv->dvdnav, dvdnav_priv->current_pci);
+#else
+ dvdnav_lower_button_select(dvdnav_priv->dvdnav);
+#endif
break;
case MP_CMD_DVDNAV_LEFT:
- dvdnav_left_button_select(dvdnav_priv->dvdnav);
+#ifndef DVDNAV_OLDAPI
+ if (dvdnav_priv->current_pci)
+ dvdnav_left_button_select(dvdnav_priv->dvdnav, dvdnav_priv->current_pci);
+#else
+ dvdnav_left_button_select(dvdnav_priv->dvdnav);
+#endif
break;
case MP_CMD_DVDNAV_RIGHT:
- dvdnav_right_button_select(dvdnav_priv->dvdnav);
+#ifndef DVDNAV_OLDAPI
+ if (dvdnav_priv->current_pci)
+ dvdnav_right_button_select(dvdnav_priv->dvdnav, dvdnav_priv->current_pci);
+#else
+ dvdnav_right_button_select(dvdnav_priv->dvdnav);
+#endif
break;
case MP_CMD_DVDNAV_MENU:
printf("Menu call\n");
dvdnav_menu_call(dvdnav_priv->dvdnav,DVD_MENU_Root);
break;
case MP_CMD_DVDNAV_SELECT:
- dvdnav_button_activate(dvdnav_priv->dvdnav);
+#ifndef DVDNAV_OLDAPI
+ if (dvdnav_priv->current_pci)
+ dvdnav_button_activate(dvdnav_priv->dvdnav, dvdnav_priv->current_pci);
+#else
+ dvdnav_button_activate(dvdnav_priv->dvdnav);
+#endif
break;
default:
mp_msg(MSGT_CPLAYER, MSGL_V, "Weird DVD Nav cmd %d\n",cmd->args[0].v.i);
Binärdateien MPlayer-0.90rc4.orig/mplayer.o and MPlayer-0.90rc4/mplayer.o sind verschieden.
-------------- next part --------------
diff -ur live.orig/config.linux live/config.linux
--- live.orig/config.linux 2003-09-25 05:40:04.000000000 +0200
+++ live/config.linux 2003-09-25 17:04:28.000000000 +0200
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t
+COMPILE_OPTS = $(INCLUDES) -I. $(RPM_OPT_FLAGS) -DSOCKLEN_T=socklen_t
C = c
C_COMPILER = cc
C_FLAGS = $(COMPILE_OPTS)
diff -ur live.orig/groupsock/Groupsock.cpp live/groupsock/Groupsock.cpp
--- live.orig/groupsock/Groupsock.cpp 2003-09-25 05:39:59.000000000 +0200
+++ live/groupsock/Groupsock.cpp 2003-09-25 17:04:28.000000000 +0200
@@ -26,7 +26,7 @@
#if defined(__WIN32__) || defined(_WIN32)
#include <strstrea.h>
#else
-#include <strstream.h>
+#include <strstream>
#endif
#include <stdio.h>
diff -ur live.orig/groupsock/NetInterface.cpp live/groupsock/NetInterface.cpp
--- live.orig/groupsock/NetInterface.cpp 2003-09-25 05:39:59.000000000 +0200
+++ live/groupsock/NetInterface.cpp 2003-09-25 17:05:03.000000000 +0200
@@ -24,7 +24,7 @@
#if defined(__WIN32__) || defined(_WIN32)
#include <strstrea.h>
#else
-#include <strstream.h>
+#include <strstream>
#endif
////////// NetInterface //////////
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 232 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20030926/3eb3ebc0/attachment.pgp>
More information about the MPlayer-dev-eng
mailing list