[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[101] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[101] mplayerxp
|
From: <nic...@us...> - 2010-01-15 17:48:13
|
Revision: 101
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=101&view=rev
Author: nickols_k
Date: 2010-01-15 17:48:06 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
cleanups
Modified Paths:
--------------
mplayerxp/cfg-mplayer.h
mplayerxp/cfgparser.c
mplayerxp/configure
mplayerxp/libmpcodecs/ad_a52.c
mplayerxp/libmpcodecs/ad_acm.c
mplayerxp/libmpcodecs/ad_dca.c
mplayerxp/libmpcodecs/ad_dmo.c
mplayerxp/libmpcodecs/ad_dshow.c
mplayerxp/libmpcodecs/ad_dvdpcm.c
mplayerxp/libmpcodecs/ad_faad.c
mplayerxp/libmpcodecs/ad_ffmp3.c
mplayerxp/libmpcodecs/ad_hwac3.c
mplayerxp/libmpcodecs/ad_libdv.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/ad_null.c
mplayerxp/libmpcodecs/ad_pcm.c
mplayerxp/libmpcodecs/ad_real.c
mplayerxp/libmpcodecs/ad_twin.c
mplayerxp/libmpcodecs/ad_vorbis.c
mplayerxp/libmpcodecs/dec_audio.c
mplayerxp/libmpcodecs/dec_audio.h
mplayerxp/libmpcodecs/dec_video.c
mplayerxp/libmpcodecs/vd.c
mplayerxp/libmpcodecs/vd_divx4.c
mplayerxp/libmpcodecs/vd_dmo.c
mplayerxp/libmpcodecs/vd_dshow.c
mplayerxp/libmpcodecs/vd_huffyuv.c
mplayerxp/libmpcodecs/vd_libdv.c
mplayerxp/libmpcodecs/vd_libmpeg2.c
mplayerxp/libmpcodecs/vd_mpegpes.c
mplayerxp/libmpcodecs/vd_null.c
mplayerxp/libmpcodecs/vd_nuv.c
mplayerxp/libmpcodecs/vd_qtvideo.c
mplayerxp/libmpcodecs/vd_raw.c
mplayerxp/libmpcodecs/vd_real.c
mplayerxp/libmpcodecs/vd_theora.c
mplayerxp/libmpcodecs/vd_vfw.c
mplayerxp/libmpcodecs/vd_xanim.c
mplayerxp/libmpcodecs/vd_xvid.c
mplayerxp/libmpdemux/cache2.c
mplayerxp/libmpdemux/cdda.c
mplayerxp/libmpdemux/demux_rawaudio.c
mplayerxp/libmpdemux/demux_rawvideo.c
mplayerxp/libmpdemux/demux_viv.c
mplayerxp/libmpdemux/stream.c
mplayerxp/libmpdemux/stream.h
mplayerxp/libvo/font_load.c
mplayerxp/libvo/sub.c
mplayerxp/libvo/sub.h
mplayerxp/mp-opt-reg.c
mplayerxp/my_malloc.c
mplayerxp/playtree.c
mplayerxp/spudec.c
Modified: mplayerxp/cfg-mplayer.h
===================================================================
--- mplayerxp/cfg-mplayer.h 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/cfg-mplayer.h 2010-01-15 17:48:06 UTC (rev 101)
@@ -396,5 +396,5 @@
{ "net", &net_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Network specific options" },
#endif
// ------------------------- codec/pp options --------------------
- {NULL, NULL, 0, 0, 0, 0, NULL}
+ {NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
Modified: mplayerxp/cfgparser.c
===================================================================
--- mplayerxp/cfgparser.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/cfgparser.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -1320,52 +1320,54 @@
,opts[i].name
,(opts[i].type==CONF_TYPE_PRINT && strcmp(opts[i].help,"show help")!=0)?opts[i].p:opts[i].help);
if((opts[i].flags&CONF_NOCFG)==0) {
- MSG_INFO(" {%s:",
+ MSG_INFO(" {%s=",
opts[i].type==CONF_TYPE_FLAG?"flg":
opts[i].type==CONF_TYPE_INT?"int":
opts[i].type==CONF_TYPE_FLOAT?"flt":
opts[i].type==CONF_TYPE_STRING?"str":"");
switch(opts[i].type) {
case CONF_TYPE_FLAG: {
- int defv = *((int*)(opts[i].p));
- MSG_INFO("<default=%i>",defv);
+ int defv = (*((int*)(opts[i].p)))?1:0;
+ int max = opts[i].max ? 1:0;
+ int res = !(defv^max);
+ MSG_INFO("%s",res?"ON":"OFF");
}
break;
case CONF_TYPE_STRING: {
const char **defv = (const char**)(opts[i].p);
- if(defv) MSG_INFO("'%s'",*defv);
+ if(defv) MSG_INFO("\"%s\"",*defv);
}
break;
case CONF_TYPE_INT: {
int defv = *((int*)(opts[i].p));
+ MSG_INFO("%i",defv);
if((opts[i].flags&CONF_RANGE)==CONF_RANGE) {
- MSG_INFO("[%i...%i]",(int)opts[i].min,(int)opts[i].max);
+ MSG_INFO(" [%i...%i]",(int)opts[i].min,(int)opts[i].max);
}
else
if((opts[i].flags&CONF_MIN)==CONF_MIN) {
- MSG_INFO("<min=%i>",(int)opts[i].min);
+ MSG_INFO(" <min=%i>",(int)opts[i].min);
}
else
if((opts[i].flags&CONF_MAX)==CONF_MAX) {
- MSG_INFO("<max=%i>",(int)opts[i].max);
+ MSG_INFO(" <max=%i>",(int)opts[i].max);
}
- MSG_INFO("<default=%i>",defv);
}
break;
case CONF_TYPE_FLOAT: {
float defv = *((float*)(opts[i].p));
+ MSG_INFO("%f",defv);
if((opts[i].flags&CONF_RANGE)==CONF_RANGE) {
- MSG_INFO("[%f...%f]",(float)opts[i].min,(float)opts[i].max);
+ MSG_INFO(" [%f...%f]",(float)opts[i].min,(float)opts[i].max);
}
else
if((opts[i].flags&CONF_MIN)==CONF_MIN) {
- MSG_INFO("<min=%f>",(float)opts[i].min);
+ MSG_INFO(" <min=%f>",(float)opts[i].min);
}
else
if((opts[i].flags&CONF_MAX)==CONF_MAX) {
- MSG_INFO("<float=%f>",(float)opts[i].max);
+ MSG_INFO(" <max=%f>",(float)opts[i].max);
}
- MSG_INFO("<default=%f>",defv);
}
break;
default:
Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/configure 2010-01-15 17:48:06 UTC (rev 101)
@@ -329,6 +329,7 @@
#enabled gomp && check_cflags -ftree-parallelize-loops=4
#####################################################
add_cflags "-Werror-implicit-function-declaration"
+check_cflags "-Wextra"
echocheck CFLAGS
echores $CFLAGS
Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_a52.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -36,7 +36,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(a52)
Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_acm.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -19,7 +19,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(msacm)
Modified: mplayerxp/libmpcodecs/ad_dca.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_dca.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -42,7 +42,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(dca)
Modified: mplayerxp/libmpcodecs/ad_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_dmo.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -19,7 +19,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(dmo)
Modified: mplayerxp/libmpcodecs/ad_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_dshow.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -17,7 +17,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(dshow)
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -14,7 +14,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(dvdpcm)
Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_faad.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -30,7 +30,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(faad)
Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -18,8 +18,6 @@
#define FF_INPUT_BUFFER_PADDING_SIZE 8
#endif
-static AVCodec *lavc_codec=NULL;
-static AVCodecContext *lavc_context;
static int acodec_inited;
static const ad_info_t info =
@@ -31,7 +29,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(ffmp3)
@@ -46,6 +44,8 @@
{
int x;
float pts;
+ AVCodec *lavc_codec=NULL;
+ AVCodecContext *lavc_context;
MSG_V("FFmpeg's libavcodec audio codec\n");
if(!acodec_inited){
avcodec_init();
@@ -114,7 +114,8 @@
void uninit(sh_audio_t *sh)
{
- avcodec_close(lavc_context);
+ AVCodecContext *lavc_context=sh->context;
+ avcodec_close(sh->context);
if (lavc_context->extradata) free(lavc_context->extradata);
free(lavc_context);
acodec_inited=0;
@@ -122,7 +123,14 @@
int control(sh_audio_t *sh,int cmd,void* arg, ...)
{
- return CONTROL_UNKNOWN;
+ AVCodecContext *lavc_context = sh->context;
+ switch(cmd){
+ case ADCTRL_RESYNC_STREAM:
+ avcodec_flush_buffers(lavc_context);
+ return CONTROL_TRUE;
+ default: break;
+ }
+ return CONTROL_UNKNOWN;
}
int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen,float *pts)
Modified: mplayerxp/libmpcodecs/ad_hwac3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_hwac3.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -150,7 +150,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(hwac3)
Modified: mplayerxp/libmpcodecs/ad_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_libdv.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -26,7 +26,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(libdv)
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -21,7 +21,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(mp3)
@@ -331,24 +331,6 @@
int control(sh_audio_t *sh,int cmd,void* arg, ...)
{
- float pts;
- switch(cmd)
- {
- case ADCTRL_RESYNC_STREAM:
-#if 0
- MP3_DecodeFrame(NULL,-2,&pts); // resync
- MP3_DecodeFrame(NULL,-2,&pts); // resync
- MP3_DecodeFrame(NULL,-2,&pts); // resync
-#endif
- return CONTROL_TRUE;
- case ADCTRL_SKIP_FRAME:
-#if 0
- MP3_DecodeFrame(NULL,-2,&pts); // skip MPEG frame
-#endif
- return CONTROL_TRUE;
- default:
- return CONTROL_UNKNOWN;
- }
return CONTROL_UNKNOWN;
}
@@ -358,7 +340,7 @@
unsigned char *indata=NULL;
int err,indata_size;
size_t len=0,done;
- while(len<minlen) {
+ while(len<(size_t)minlen) {
indata_size=ds_get_packet_r(sh->ds,&indata,len>0?&apts:pts);
if(!indata_size) break;
err=mpg123_decode(sh->context,indata,indata_size,buf,maxlen,&done);
Modified: mplayerxp/libmpcodecs/ad_null.c
===================================================================
--- mplayerxp/libmpcodecs/ad_null.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_null.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -12,7 +12,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(null)
Modified: mplayerxp/libmpcodecs/ad_pcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_pcm.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -13,7 +13,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(pcm)
Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_real.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -19,7 +19,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(real)
Modified: mplayerxp/libmpcodecs/ad_twin.c
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_twin.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -21,7 +21,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(twin)
Modified: mplayerxp/libmpcodecs/ad_vorbis.c
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/ad_vorbis.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -17,7 +17,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBAD_EXTERN(vorbis)
Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/dec_audio.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -340,22 +340,21 @@
return cp_size;
}
+/* Note: it is called once after seeking, to resync. */
void resync_audio_stream(sh_audio_t *sh_audio)
{
- if(sh_audio)
- if(sh_audio->inited && mpadec) mpadec->control(sh_audio,ADCTRL_RESYNC_STREAM,NULL);
+ if(sh_audio) {
+ sh_audio->a_in_buffer_len=0; /* workaround */
+ if(sh_audio->inited && mpadec) mpadec->control(sh_audio,ADCTRL_RESYNC_STREAM,NULL);
+ }
}
+/* Note: it is called to skip (jump over) small amount (1/10 sec or 1 frame)
+ of audio data - used to sync audio to video after seeking */
void skip_audio_frame(sh_audio_t *sh_audio)
{
+ int rc=CONTROL_TRUE;
if(sh_audio)
- if(sh_audio->inited && mpadec) mpadec->control(sh_audio,ADCTRL_SKIP_FRAME,NULL);
+ if(sh_audio->inited && mpadec) rc=mpadec->control(sh_audio,ADCTRL_SKIP_FRAME,NULL);
+ if(rc!=CONTROL_TRUE) ds_fill_buffer(sh_audio->ds);
}
-
-/* MP3 decoder buffer callback:*/
-int mplayer_audio_read(char *buf,int size,float *pts){
- int len;
- len=demux_read_data_r(dec_audio_sh->ds,buf,size,pts);
- MSG_DBG2("%i=mplayer_audio_read(%p,%i,%f)\n",len,buf,size,*pts);
- return len;
-}
Modified: mplayerxp/libmpcodecs/dec_audio.h
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.h 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/dec_audio.h 2010-01-15 17:48:06 UTC (rev 101)
@@ -6,9 +6,6 @@
extern void resync_audio_stream(sh_audio_t *sh_audio);
extern void skip_audio_frame(sh_audio_t *sh_audio);
-// MP3 decoder buffer callback:
-extern int mplayer_audio_read(char *buf,int size,float *pts);
-
extern int init_audio_filters(sh_audio_t *sh_audio,
int in_samplerate, int in_channels, int in_format, int in_bps,
int out_samplerate, int out_channels, int out_format, int out_bps,
Modified: mplayerxp/libmpcodecs/dec_video.c
===================================================================
--- mplayerxp/libmpcodecs/dec_video.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/dec_video.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -89,7 +89,7 @@
extern char *video_codec;
int init_video(sh_video_t *sh_video,const char* codecname,const char * vfm,int status){
- unsigned o_bps,bpp,vf_flags;
+ unsigned o_bps,bpp;
sh_video->codec=NULL;
MSG_DBG3("init_video(%p, %s, %s, %i)\n",sh_video,codecname,vfm,status);
while((sh_video->codec=find_codec(sh_video->format,
@@ -166,6 +166,7 @@
sh_video->inited=1;
#ifdef _OPENMP
if(enable_gomp) {
+ int vf_flags;
smp_num_cpus=omp_get_num_procs();
vf_flags=vf_query_flags(sh_video->vfilter);
use_vf_threads=0;
Modified: mplayerxp/libmpcodecs/vd.c
===================================================================
--- mplayerxp/libmpcodecs/vd.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -126,7 +126,7 @@
for(i=0;i<CODECS_MAX_OUTFMT;i++){
int flags;
out_fmt=sh->codec->outfmt[i];
- if(out_fmt==(signed int)0xFFFFFFFF) continue;
+ if(out_fmt==0xFFFFFFFF) continue;
flags=vf_query_format(vf,out_fmt,w,h);
MSG_DBG2("vo_debug[step i=%d]: query(%s %ix%i) returned 0x%X for:\n",i,vo_format_name(out_fmt),w,h,flags);
if(verbose>1) if(verbose) vf_showlist(vf);
@@ -152,7 +152,7 @@
int ind;
MSG_WARN("Can't find colorspace for: ");
for(ind=0;ind<CODECS_MAX_OUTFMT;ind++) {
- if(sh->codec->outfmt[ind]==(signed int)0xFFFFFFFF) break;
+ if(sh->codec->outfmt[ind]==0xFFFFFFFF) break;
MSG_WARN("'%s' ",vo_format_name(sh->codec->outfmt[ind]));
}
MSG_WARN("Trying -vf fmtcvt\n");
Modified: mplayerxp/libmpcodecs/vd_divx4.c
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_divx4.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -29,7 +29,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(divx4)
Modified: mplayerxp/libmpcodecs/vd_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_dmo.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -22,7 +22,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(dmo)
Modified: mplayerxp/libmpcodecs/vd_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_dshow.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -20,7 +20,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(dshow)
Modified: mplayerxp/libmpcodecs/vd_huffyuv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_huffyuv.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -32,7 +32,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(huffyuv)
@@ -506,7 +506,7 @@
{
mp_image_t* mpi;
int pixel_ptr;
- unsigned char y1, y2, u, v, r, g, b, a;
+ unsigned char y1, y2, u, v, r, g, b;
unsigned char left_y, left_u, left_v, left_r, left_g, left_b;
unsigned char tmp, mi, mx, med;
unsigned char *swap;
Modified: mplayerxp/libmpcodecs/vd_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_libdv.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -27,7 +27,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(libdv)
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -27,7 +27,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(libmpeg2)
Modified: mplayerxp/libmpcodecs/vd_mpegpes.c
===================================================================
--- mplayerxp/libmpcodecs/vd_mpegpes.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_mpegpes.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -14,7 +14,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(mpegpes)
Modified: mplayerxp/libmpcodecs/vd_null.c
===================================================================
--- mplayerxp/libmpcodecs/vd_null.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_null.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -14,7 +14,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(null)
Modified: mplayerxp/libmpcodecs/vd_nuv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_nuv.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_nuv.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -13,7 +13,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(nuv)
Modified: mplayerxp/libmpcodecs/vd_qtvideo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_qtvideo.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -23,7 +23,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(qtvideo)
Modified: mplayerxp/libmpcodecs/vd_raw.c
===================================================================
--- mplayerxp/libmpcodecs/vd_raw.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_raw.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -13,7 +13,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(raw)
Modified: mplayerxp/libmpcodecs/vd_real.c
===================================================================
--- mplayerxp/libmpcodecs/vd_real.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_real.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -18,7 +18,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(real)
Modified: mplayerxp/libmpcodecs/vd_theora.c
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_theora.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -21,7 +21,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(theora)
Modified: mplayerxp/libmpcodecs/vd_vfw.c
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_vfw.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -30,7 +30,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
#define info info_vfw
Modified: mplayerxp/libmpcodecs/vd_xanim.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_xanim.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -36,7 +36,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(xanim)
@@ -246,7 +246,7 @@
char *error;
XAVID_MOD_HDR *mod_hdr;
XAVID_FUNC_HDR *func;
- int i;
+ unsigned int i;
codec_driver->file_handler = dlopen(filename, RTLD_NOW|RTLD_GLOBAL);
if (!codec_driver->file_handler)
@@ -766,7 +766,7 @@
unsigned int map_flag, unsigned int *map, XA_CHDR *chdr)
{
xacodec_image_t *image=(xacodec_image_t*)image_p;
- int y;
+ unsigned int y;
int uvstride;
MSG_DBG3( "YUVTabs: %d %p %p %p %p %p\n",yuv_tabs->Uskip_mask,
@@ -803,7 +803,7 @@
unsigned int stridev=image->stride[2];
unsigned char *du=image->planes[1]+2*y*strideu;
unsigned char *dv=image->planes[2]+2*y*stridev;
- int x;
+ unsigned int x;
if(yuv_tabs->YUV_Y_tab){ // dirty hack to detect iv32:
for(x=0;x<imagex;x++){
du[2*x]=du[2*x+1]=du[2*x+strideu]=du[2*x+strideu+1]=su[x]*2;
@@ -860,7 +860,7 @@
#warning "FIXME! Decoder doesn't supports Vivo/2.00 :("
-if(i_x==image->width && i_y==image->height){
+if(i_x==(unsigned)image->width && i_y==(unsigned)image->height){
image->planes[0]=yuv->Ybuf;
if(image->out_fmt==IMGFMT_YV12){
image->planes[1]=yuv->Ubuf;
@@ -872,7 +872,7 @@
image->stride[0]=i_x; // yuv->y_w
image->stride[1]=image->stride[2]=i_x/2; // yuv->uv_w
} else {
- int y;
+ unsigned int y;
for(y=0;y<i_y;y++)
memcpy(image->planes[0]+y*image->stride[0],yuv->Ybuf+y*i_x,i_x);
i_x>>=1; i_y>>=1;
Modified: mplayerxp/libmpcodecs/vd_xvid.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpcodecs/vd_xvid.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -35,7 +35,7 @@
} priv_t;
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
LIBVD_EXTERN(xvid)
@@ -199,6 +199,7 @@
/* Returns DAR value according to VOL's informations contained in stats
* param */
+#if 0
static float stats2aspect(xvid_dec_stats_t *stats)
{
if (stats->type == XVID_TYPE_VOL) {
@@ -254,7 +255,7 @@
return(0.0f);
}
-
+#endif
// init driver
static int init(sh_video_t *sh){
xvid_gbl_info_t xvid_gbl_info;
Modified: mplayerxp/libmpdemux/cache2.c
===================================================================
--- mplayerxp/libmpdemux/cache2.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpdemux/cache2.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -601,8 +601,9 @@
/*
main interface here!
*/
-int __FASTCALL__ stream_read(stream_t *s,char* mem,int total)
+int __FASTCALL__ stream_read(stream_t *s,void* _mem,int total)
{
+ char *mem = _mem;
if(s->cache_data) return c2_stream_read(s->cache_data,mem,total);
else return nc_stream_read(s,mem,total);
}
Modified: mplayerxp/libmpdemux/cdda.c
===================================================================
--- mplayerxp/libmpdemux/cdda.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpdemux/cdda.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -16,16 +16,16 @@
static int no_skip = 0;
static const config_t cdda_opts[] = {
- { "speed", &speed, CONF_TYPE_INT, CONF_RANGE,1,100, NULL },
- { "overlap", &search_overlap, CONF_TYPE_INT, CONF_RANGE,0,75, NULL },
- { "noskip", &no_skip, CONF_TYPE_FLAG, 0 , 0, 1, NULL },
- { "skip", &no_skip, CONF_TYPE_FLAG, 0 , 1, 0, NULL },
- {NULL, NULL, 0, 0, 0, 0, NULL}
+ { "speed", &speed, CONF_TYPE_INT, CONF_RANGE,1,100, NULL, "sets driver speed" },
+ { "overlap", &search_overlap, CONF_TYPE_INT, CONF_RANGE,0,75, NULL, "reserved" },
+ { "noskip", &no_skip, CONF_TYPE_FLAG, 0 , 0, 1, NULL, "reserved" },
+ { "skip", &no_skip, CONF_TYPE_FLAG, 0 , 1, 0, NULL, "reserved" },
+ {NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
static const config_t cdda_conf[] = {
- { "cdda", &cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
- { NULL,NULL, 0, 0, 0, 0, NULL}
+ { "cdda", &cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "CD-DA related options"},
+ { NULL,NULL, 0, 0, 0, 0, NULL, NULL}
};
void cdda_register_options(m_config_t* cfg) {
Modified: mplayerxp/libmpdemux/demux_rawaudio.c
===================================================================
--- mplayerxp/libmpdemux/demux_rawaudio.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpdemux/demux_rawaudio.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -22,12 +22,12 @@
{ "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL, "specifies sample-rate of raw-audio steram" },
{ "samplesize", &samplesize, CONF_TYPE_INT,CONF_RANGE,1,8, NULL, "specifies sample-size of raw-audio steram" },
{ "format", &format, CONF_TYPE_INT, CONF_MIN, 0 , 0, NULL, "specifies compression-format of raw-audio stream" },
- {NULL, NULL, 0, 0, 0, 0, NULL}
+ {NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
static const config_t rawaudio_conf[] = {
{ "rawaudio", &demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Raw-audio specific commands"},
- { NULL,NULL, 0, 0, 0, 0, NULL}
+ { NULL,NULL, 0, 0, 0, 0, NULL, NULL}
};
static int rawaudio_probe(demuxer_t* demuxer)
Modified: mplayerxp/libmpdemux/demux_rawvideo.c
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpdemux/demux_rawvideo.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -45,13 +45,12 @@
// misc:
{ "fps", &fps, CONF_TYPE_FLOAT,CONF_RANGE,0.001,1000, NULL, "specifies rate in frames per second of raw-video stream" },
{ "size", &imgsize, CONF_TYPE_INT, CONF_RANGE, 1 , 8192*8192*4, NULL, "specifies frame size in bytes" },
-
- {NULL, NULL, 0, 0, 0, 0, NULL}
+ {NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
static const config_t rawvideo_conf[] = {
{ "rawvideo", &demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Raw-video specific options"},
- { NULL,NULL, 0, 0, 0, 0, NULL}
+ { NULL,NULL, 0, 0, 0, 0, NULL, NULL}
};
static int rawvideo_probe(demuxer_t* demuxer)
Modified: mplayerxp/libmpdemux/demux_viv.c
===================================================================
--- mplayerxp/libmpdemux/demux_viv.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpdemux/demux_viv.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -87,12 +87,12 @@
{"width", &vivo_param_width, CONF_TYPE_INT, 0, 0, 0, NULL, "specifies width of video in VIVO stream" },
{"height", &vivo_param_height, CONF_TYPE_INT, 0, 0, 0, NULL, "specifies height of video in VIVO stream"},
{"vformat", &vivo_param_vformat, CONF_TYPE_INT, 0, 0, 0, NULL, "specifies video-codec of VIVO stream"},
- {NULL, NULL, 0, 0, 0, 0, NULL}
+ {NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
static config_t vivo_conf[] = {
{ "vivo", &vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Vivo specific options"},
- { NULL,NULL, 0, 0, 0, 0, NULL}
+ { NULL,NULL, 0, 0, 0, 0, NULL, NULL}
};
/* parse all possible extra headers */
Modified: mplayerxp/libmpdemux/stream.c
===================================================================
--- mplayerxp/libmpdemux/stream.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpdemux/stream.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -271,7 +271,7 @@
return stream_eof(s)?-256:retval;
}
-int __FASTCALL__ nc_stream_read(stream_t *s,char* _mem,int total){
+int __FASTCALL__ nc_stream_read(stream_t *s,void* _mem,int total){
int i,x,ilen,_total=total,got_len;
char *mem=_mem;
MSG_DBG3( "nc_stream_read %u bytes from %llu\n",total,FILE_POS(s)+s->buf_pos);
@@ -348,7 +348,7 @@
mem+=x; ilen-=x;
}
MSG_DBG3( "nc_stream_read got %u bytes ",total);
- for(i=0;i<min(8,total);i++) MSG_DBG3("%02X ",(int)((unsigned char)_mem[i]));
+ for(i=0;i<min(8,total);i++) MSG_DBG3("%02X ",(int)((unsigned char)mem[i]));
MSG_DBG3("\n");
return total;
}
Modified: mplayerxp/libmpdemux/stream.h
===================================================================
--- mplayerxp/libmpdemux/stream.h 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libmpdemux/stream.h 2010-01-15 17:48:06 UTC (rev 101)
@@ -71,7 +71,7 @@
extern int __FASTCALL__ nc_stream_seek_long(stream_t *s,off_t pos);
extern void __FASTCALL__ nc_stream_reset(stream_t *s);
extern int __FASTCALL__ nc_stream_read_char(stream_t *s);
-extern int __FASTCALL__ nc_stream_read(stream_t *s,char* mem,int total);
+extern int __FASTCALL__ nc_stream_read(stream_t *s,void* mem,int total);
extern off_t __FASTCALL__ nc_stream_tell(stream_t *s);
extern int __FASTCALL__ nc_stream_seek(stream_t *s,off_t pos);
extern int __FASTCALL__ nc_stream_skip(stream_t *s,off_t len);
@@ -79,7 +79,7 @@
/* this block describes interface to cache/non-cache stream functions */
extern int __FASTCALL__ stream_read_char(stream_t *s);
-extern int __FASTCALL__ stream_read(stream_t *s,char* mem,int total);
+extern int __FASTCALL__ stream_read(stream_t *s,void* mem,int total);
extern off_t __FASTCALL__ stream_tell(stream_t *s);
extern int __FASTCALL__ stream_seek(stream_t *s,off_t pos);
extern int __FASTCALL__ stream_skip(stream_t *s,off_t len);
Modified: mplayerxp/libvo/font_load.c
===================================================================
--- mplayerxp/libvo/font_load.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libvo/font_load.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -41,7 +41,7 @@
}
font_desc_t* read_font_desc(char* fname,float factor,int verbose){
-unsigned char sor[1024];
+char sor[1024];
unsigned char sor2[1024];
font_desc_t *desc;
FILE *f;
@@ -80,14 +80,14 @@
section[0]=0;
while(fgets(sor,1020,f)){
- unsigned char* p[8];
+ char* p[8];
int pdb=0;
- unsigned char *s=sor;
+ unsigned char *s=(unsigned char *)sor;
unsigned char *d=sor2;
int ec=' ';
int id=0;
sor[1020]=0;
- p[0]=d;++pdb;
+ p[0]=(char *)d;++pdb;
while(1){
int c=*s++;
if(c==0 || c==13 || c==10) break;
@@ -98,7 +98,7 @@
if(c==' '){
if(ec==' ') continue;
*d=0; ++d;
- p[pdb]=d;++pdb;
+ p[pdb]=(char *)d;++pdb;
if(pdb>=8) break;
continue;
}
Modified: mplayerxp/libvo/sub.c
===================================================================
--- mplayerxp/libvo/sub.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libvo/sub.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -38,7 +38,7 @@
//static int vo_font_loaded=-1;
font_desc_t* vo_font=NULL;
-unsigned char* vo_osd_text=NULL;
+char* vo_osd_text=NULL;
int sub_unicode=0;
int sub_utf8=0;
int sub_pos=100;
@@ -116,7 +116,7 @@
}
inline static void __FASTCALL__ vo_update_text_osd(mp_osd_obj_t* obj,int dxs,int dys){
- unsigned char *cp=vo_osd_text;
+ unsigned char *cp=(unsigned char *)vo_osd_text;
int x=20;
int h=0;
UNUSED(dxs);
@@ -137,7 +137,7 @@
}
inline static void __FASTCALL__ vo_draw_text_osd(mp_osd_obj_t* obj,draw_osd_f draw_alpha){
- unsigned char *cp=vo_osd_text;
+ unsigned char *cp=(unsigned char *)vo_osd_text;
int font;
int x=obj->x;
Modified: mplayerxp/libvo/sub.h
===================================================================
--- mplayerxp/libvo/sub.h 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/libvo/sub.h 2010-01-15 17:48:06 UTC (rev 101)
@@ -65,7 +65,7 @@
extern font_desc_t* vo_font;
-extern unsigned char* vo_osd_text;
+extern char* vo_osd_text;
extern int vo_osd_progbar_type;
extern int vo_osd_progbar_value; // 0..255
Modified: mplayerxp/mp-opt-reg.c
===================================================================
--- mplayerxp/mp-opt-reg.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/mp-opt-reg.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -8,7 +8,7 @@
extern void mp_input_register_options(m_config_t* cfg);
extern void libmpdemux_register_options(m_config_t* cfg);
extern void demuxer_register_options(m_config_t* cfg);
-#ifdef HAVE_CDDA
+#ifdef HAVE_LIBCDIO
extern void cdda_register_options(m_config_t* cfg);
#endif
extern void libmpcodecs_ad_register_options(m_config_t* cfg);
@@ -19,7 +19,7 @@
mp_input_register_options(cfg);
libmpdemux_register_options(cfg);
demuxer_register_options(cfg);
-#ifdef HAVE_CDDA
+#ifdef HAVE_LIBCDIO
cdda_register_options(cfg);
#endif
libmpcodecs_ad_register_options(cfg);
Modified: mplayerxp/my_malloc.c
===================================================================
--- mplayerxp/my_malloc.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/my_malloc.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -33,7 +33,7 @@
if(crc != (long)((char *)__ptr-sizeof(long)))
{
printf("Internal error: my_realloc found out memory corruption!\n");
- printf("INFO: ptr=%08X ptr[0]=%08X crc=%08X\n",
+ printf("INFO: ptr=%p ptr[0]=%lX crc=%lX\n",
__ptr,
osize,
crc);
@@ -83,7 +83,7 @@
if(crc != (long)myptr)
{
printf("Internal error: my_free found out memory corruption!\n");
- printf("INFO: ptr=%08X ptr[0]=%08X crc=%08X\n",
+ printf("INFO: ptr=%p ptr[0]=%lX crc=%lX\n",
__ptr,
osize,
crc);
Modified: mplayerxp/playtree.c
===================================================================
--- mplayerxp/playtree.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/playtree.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -511,7 +511,7 @@
static play_tree_t*
play_tree_rnd_step(play_tree_t* pt) {
int count = 0;
- int r,rnd,j;
+ int r,rnd;
time_t tim;
play_tree_t *i,*head;
Modified: mplayerxp/spudec.c
===================================================================
--- mplayerxp/spudec.c 2010-01-14 15:50:02 UTC (rev 100)
+++ mplayerxp/spudec.c 2010-01-15 17:48:06 UTC (rev 101)
@@ -347,7 +347,7 @@
unsigned int next_off;
unsigned int start_pts=0;
unsigned int end_pts=0;
- unsigned int current_nibble[2];
+ unsigned int current_nibble[2] = { 0, 0 };
unsigned int control_start;
unsigned int display = 0;
unsigned int start_col = 0;
@@ -479,8 +479,7 @@
static void __FASTCALL__ spudec_decode(spudec_handle_t *this, unsigned int pts100)
{
if(this->hw_spu) {
- static vo_mpegpes_t packet = { NULL, 0, 0x20, 0 };
- static vo_mpegpes_t *pkg=&packet;
+ vo_mpegpes_t packet = { NULL, 0, 0x20, 0 };
packet.data = this->packet;
packet.size = this->packet_size;
packet.timestamp = pts100;
@@ -688,8 +687,8 @@
unsigned int t;
unsigned int delta_src = end_src - start_src;
unsigned int delta_tar = end_tar - start_tar;
- int src = 0;
- int src_step;
+ unsigned int src = 0;
+ unsigned int src_step;
if (delta_src == 0 || delta_tar == 0) {
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
