[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[265] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[265] mplayerxp
|
From: <nic...@us...> - 2012-10-30 17:46:18
|
Revision: 265
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=265&view=rev
Author: nickols_k
Date: 2012-10-30 17:46:02 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
size optimization
Modified Paths:
--------------
mplayerxp/dump.c
mplayerxp/fifo.c
mplayerxp/libao2/ao_alsa9.c
mplayerxp/libao2/ao_esd.c
mplayerxp/libao2/ao_jack.c
mplayerxp/libao2/ao_nas.c
mplayerxp/libao2/ao_null.c
mplayerxp/libao2/ao_openal.c
mplayerxp/libao2/ao_oss.c
mplayerxp/libao2/ao_sdl.c
mplayerxp/libao2/ao_wav.c
mplayerxp/libao2/audio_out.c
mplayerxp/libmpcodecs/ad_libdv.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/dec_audio.c
mplayerxp/libmpcodecs/vd_divx4.c
mplayerxp/libmpcodecs/vd_vfw.c
mplayerxp/libmpcodecs/vd_xvid.c
mplayerxp/libmpconf/m_struct.c
mplayerxp/libmpdemux/cache2.c
mplayerxp/libmpdemux/cdda.c
mplayerxp/libmpdemux/cddb.c
mplayerxp/libmpdemux/demux_aiff.c
mplayerxp/libmpdemux/demux_audio.c
mplayerxp/libmpdemux/demux_avi.c
mplayerxp/libmpdemux/demux_dv.c
mplayerxp/libmpdemux/demux_mkv.c
mplayerxp/libmpdemux/demux_mov.c
mplayerxp/libmpdemux/demux_mpxp64.c
mplayerxp/libmpdemux/demux_nuv.c
mplayerxp/libmpdemux/demux_pva.c
mplayerxp/libmpdemux/demux_ra.c
mplayerxp/libmpdemux/demux_real.c
mplayerxp/libmpdemux/demux_smjpeg.c
mplayerxp/libmpdemux/demux_ts.c
mplayerxp/libmpdemux/demux_viv.c
mplayerxp/libmpdemux/demux_vqf.c
mplayerxp/libmpdemux/demux_y4m.c
mplayerxp/libmpdemux/demuxer.c
mplayerxp/libmpdemux/http.c
mplayerxp/libmpdemux/librtsp/rtsp_rtp.c
mplayerxp/libmpdemux/mux_mpxp64.c
mplayerxp/libmpdemux/mux_raw.c
mplayerxp/libmpdemux/muxer.c
mplayerxp/libmpdemux/network.c
mplayerxp/libmpdemux/parse_mp4.c
mplayerxp/libmpdemux/s_dvdread.c
mplayerxp/libmpdemux/s_ftp.c
mplayerxp/libmpdemux/stream.c
mplayerxp/libmpdemux/sub_cc.c
mplayerxp/libmpdemux/sub_ty.c
mplayerxp/libmpdemux/tvi_dummy.c
mplayerxp/libmpdemux/tvi_v4l.c
mplayerxp/libvo/font_load.c
mplayerxp/libvo/sub.c
mplayerxp/libvo/video_out.c
mplayerxp/libvo/vo_dga.c
mplayerxp/libvo/vo_fbdev.c
mplayerxp/libvo/vo_null.c
mplayerxp/libvo/vo_opengl.c
mplayerxp/libvo/vo_sdl.c
mplayerxp/libvo/vo_vesa.c
mplayerxp/libvo/vo_x11.c
mplayerxp/libvo/vo_xv.c
mplayerxp/libvo/vo_xvidix.c
mplayerxp/libvo/vosub_vidix.c
mplayerxp/libvo/x11_common.c
mplayerxp/loader/dmo/DMO_AudioDecoder.c
mplayerxp/loader/dmo/DMO_VideoDecoder.c
mplayerxp/loader/dmo/dmo.c
mplayerxp/loader/driver.c
mplayerxp/loader/dshow/DS_VideoDecoder.c
mplayerxp/loader/dshow/inputpin.c
mplayerxp/loader/module.c
mplayerxp/loader/win32.c
mplayerxp/mp_image.c
mplayerxp/mplayer.c
mplayerxp/postproc/af.c
mplayerxp/postproc/af_channels.c
mplayerxp/postproc/vf.c
mplayerxp/postproc/vf_1bpp.c
mplayerxp/postproc/vf_delogo.c
mplayerxp/postproc/vf_denoise3d.c
mplayerxp/postproc/vf_expand.c
mplayerxp/postproc/vf_il.c
mplayerxp/postproc/vf_noise.c
mplayerxp/postproc/vf_ow.c
mplayerxp/postproc/vf_palette.c
mplayerxp/postproc/vf_panscan.c
mplayerxp/postproc/vf_perspective.c
mplayerxp/postproc/vf_smartblur.c
mplayerxp/postproc/vf_test.c
mplayerxp/postproc/vf_unsharp.c
mplayerxp/postproc/vf_vo.c
mplayerxp/sig_hand.c
mplayerxp/xmp_core.c
Modified: mplayerxp/dump.c
===================================================================
--- mplayerxp/dump.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/dump.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -119,9 +119,8 @@
char stream_dump_name[1024];
/* TODO copy it from demuxer */
if(demuxer->priv) return;
- demuxer->priv=mp_malloc(sizeof(priv_t));
+ demuxer->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=demuxer->priv;
- memset(priv,0,sizeof(priv_t));
/* describe other useless dumps */
priv->mux_type=MUX_HAVE_AUDIO|MUX_HAVE_VIDEO|MUX_HAVE_SUBS;
if(port)
Modified: mplayerxp/fifo.c
===================================================================
--- mplayerxp/fifo.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/fifo.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -82,10 +82,9 @@
CBFifoBuffer *cb_fifo_alloc(unsigned int size)
{
- CBFifoBuffer *f= mp_malloc(sizeof(CBFifoBuffer));
+ CBFifoBuffer *f= mp_mallocz(sizeof(CBFifoBuffer));
if(!f)
return NULL;
- memset(f,0,sizeof(CBFifoBuffer));
f->buffer = mp_malloc(size);
f->end = f->buffer + size;
cb_fifo_reset(f);
Modified: mplayerxp/libao2/ao_alsa9.c
===================================================================
--- mplayerxp/libao2/ao_alsa9.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libao2/ao_alsa9.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -320,9 +320,8 @@
char *alsa_port=NULL;
char alsa_device[ALSA_DEVICE_SIZE];
UNUSED(flags);
- ao->priv=mp_malloc(sizeof(priv_t));
+ ao->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=ao->priv;
- memset(priv,0,sizeof(priv_t));
priv->first=1;
priv->handler = NULL;
Modified: mplayerxp/libao2/ao_esd.c
===================================================================
--- mplayerxp/libao2/ao_esd.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libao2/ao_esd.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -163,9 +163,8 @@
*/
static int init(ao_data_t* ao,unsigned flags)
{
- ao->priv=mp_malloc(sizeof(priv_t));
+ ao->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=ao->priv;
- memset(priv,0,sizeof(priv_t));
priv->fd=priv->play_fd=-1;
char *server = ao->subdevice; /* NULL for localhost */
UNUSED(flags);
Modified: mplayerxp/libao2/ao_jack.c
===================================================================
--- mplayerxp/libao2/ao_jack.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libao2/ao_jack.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -213,9 +213,7 @@
}
#endif
static int init(ao_data_t* ao,unsigned flags) {
- ao->priv=mp_malloc(sizeof(priv_t));
- priv_t*priv=ao->priv;
- memset(priv,0,sizeof(priv_t));
+ ao->priv=mp_mallocz(sizeof(priv_t));
UNUSED(flags);
return 1;
}
Modified: mplayerxp/libao2/ao_nas.c
===================================================================
--- mplayerxp/libao2/ao_nas.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libao2/ao_nas.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -416,9 +416,8 @@
static int init(ao_data_t* ao,unsigned flags)
{
- ao->priv=mp_malloc(sizeof(priv_t));
+ ao->priv=mp_mallocz(sizeof(priv_t));
priv_t* priv=ao->priv;
- memset(priv, 0, sizeof(priv_t));
UNUSED(flags);
return 1;
}
Modified: mplayerxp/libao2/ao_null.c
===================================================================
--- mplayerxp/libao2/ao_null.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libao2/ao_null.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -107,9 +107,8 @@
// open & setup audio device
// return: 1=success 0=fail
static int __FASTCALL__ init(ao_data_t* ao,unsigned flags){
- ao->priv=mp_malloc(sizeof(priv_t));
+ ao->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv = (priv_t*)ao->priv;
- memset(priv,0,sizeof(priv_t));
char *null_dev=NULL,*mode=NULL;
UNUSED(flags);
if (ao->subdevice) {
Modified: mplayerxp/libao2/ao_openal.c
===================================================================
--- mplayerxp/libao2/ao_openal.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libao2/ao_openal.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -93,9 +93,8 @@
#endif
static int init(ao_data_t* ao,unsigned flags)
{
- ao->priv=mp_malloc(sizeof(priv_t));
+ ao->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=ao->priv;
- memset(priv,0,sizeof(priv_t));
UNUSED(flags);
priv->alc_dev = alcOpenDevice(NULL);
if (!priv->alc_dev) {
Modified: mplayerxp/libao2/ao_oss.c
===================================================================
--- mplayerxp/libao2/ao_oss.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libao2/ao_oss.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -199,9 +199,8 @@
static int __FASTCALL__ init(ao_data_t* ao,unsigned flags){
char *mixer_channels [SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_NAMES;
UNUSED(flags);
- ao->priv=mp_malloc(sizeof(priv_t));
+ ao->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=ao->priv;
- memset(priv,0,sizeof(priv_t));
priv->dsp=PATH_DEV_DSP;
priv->mixer_channel=SOUND_MIXER_PCM;
priv->fd=-1;
@@ -321,7 +320,7 @@
any_t* data;
ao->buffersize=0;
#ifdef HAVE_AUDIO_SELECT
- data=mp_malloc(ao->outburst); memset(data,0,ao->outburst);
+ data=mp_mallocz(ao->outburst);
while(ao->buffersize<0x40000){
fd_set rfds;
struct timeval tv;
Modified: mplayerxp/libao2/ao_sdl.c
===================================================================
--- mplayerxp/libao2/ao_sdl.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libao2/ao_sdl.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -148,8 +148,7 @@
{
unsigned i;
UNUSED(flags);
- ao->priv=mp_malloc(sizeof(priv_t));
- memset(ao->priv,0,sizeof(priv_t));
+ ao->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=ao->priv;
priv->volume=127;
/* Allocate ring-priv->buffer memory */
Modified: mplayerxp/libao2/ao_wav.c
===================================================================
--- mplayerxp/libao2/ao_wav.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libao2/ao_wav.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -99,9 +99,8 @@
static int init(ao_data_t* ao,unsigned flags) {
// set defaults
UNUSED(flags);
- ao->priv=mp_malloc(sizeof(priv_t));
+ ao->priv=mp_mallocz(sizeof(priv_t));
priv_t* priv=ao->priv;
- memset(priv,0,sizeof(priv_t));
priv->pcm_waveheader=1;
return 1;
}
Modified: mplayerxp/libao2/audio_out.c
===================================================================
--- mplayerxp/libao2/audio_out.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libao2/audio_out.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -207,8 +207,7 @@
{
ao_data_t* ao;
int retval;
- ao=mp_malloc(sizeof(ao_data_t));
- memset(ao,0,sizeof(ao_data_t));
+ ao=mp_mallocz(sizeof(ao_data_t));
if(subdevice) ao->subdevice=mp_strdup(subdevice);
ao->outburst=OUTBURST;
ao->buffersize=-1;
Modified: mplayerxp/libmpcodecs/ad_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpcodecs/ad_libdv.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -59,8 +59,7 @@
sh->channels=h->nChannels;
sh->samplerate=h->nSamplesPerSec;
sh->samplesize=(h->wBitsPerSample+7)/8;
- priv = mp_malloc(sizeof(libdv_priv_t));
- memset(priv,0,sizeof(libdv_priv_t));
+ priv = mp_mallocz(sizeof(libdv_priv_t));
priv->decoder=init_global_rawdv_decoder();
sh->context = priv;
for (i=0; i < 4; i++)
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -272,8 +272,7 @@
sh->samplesize=4;
sh->sample_format=AFMT_FLOAT32;
mpg123_init();
- priv = mp_malloc(sizeof(mp3_priv_t));
- memset(priv,0,sizeof(mp3_priv_t));
+ priv = mp_mallocz(sizeof(mp3_priv_t));
sh->context = priv;
priv->mh = mpg123_new(NULL,&err);
if(err) {
Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpcodecs/dec_audio.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -73,8 +73,7 @@
sh_audio->a_in_buffer_size=sh_audio->audio_in_minsize;
MSG_V("dec_audio: Allocating %d bytes for input buffer\n",
sh_audio->a_in_buffer_size);
- sh_audio->a_in_buffer=mp_malloc(sh_audio->a_in_buffer_size);
- memset(sh_audio->a_in_buffer,0,sh_audio->a_in_buffer_size);
+ sh_audio->a_in_buffer=mp_mallocz(sh_audio->a_in_buffer_size);
sh_audio->a_in_buffer_len=0;
}
@@ -84,12 +83,11 @@
MSG_V("dec_audio: Allocating %d + %d = %d bytes for output buffer\n",
sh_audio->audio_out_minsize,MAX_OUTBURST,sh_audio->a_buffer_size);
- sh_audio->a_buffer=mp_malloc(sh_audio->a_buffer_size);
+ sh_audio->a_buffer=mp_mallocz(sh_audio->a_buffer_size);
if(!sh_audio->a_buffer){
MSG_ERR(MSGTR_CantAllocAudioBuf);
return 0;
}
- memset(sh_audio->a_buffer,0,sh_audio->a_buffer_size);
sh_audio->a_buffer_len=0;
if(!mpadec->init(sh_audio)){
@@ -237,8 +235,7 @@
sh_audio->af_bps = afs->output.rate*afs->output.nch*afs->output.bps;
sh_audio->a_buffer_size=out_maxsize;
- sh_audio->a_buffer=mp_malloc(sh_audio->a_buffer_size);
- memset(sh_audio->a_buffer,0,sh_audio->a_buffer_size);
+ sh_audio->a_buffer=mp_mallocz(sh_audio->a_buffer_size);
sh_audio->a_buffer_len=0;
af_showconf(afs->first);
Modified: mplayerxp/libmpcodecs/vd_divx4.c
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpcodecs/vd_divx4.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -200,9 +200,8 @@
MSG_ERR("Unsupported out_fmt: 0x%X\n",sh->codec->outfmt[sh->outfmtidx]);
return 0;
}
- if(!(p=mp_malloc(sizeof(priv_t)))) { MSG_ERR("Out of memory\n"); return 0; }
+ if(!(p=mp_mallocz(sizeof(priv_t)))) { MSG_ERR("Out of memory\n"); return 0; }
sh->context=p;
- memset(p,0,sizeof(priv_t));
if(!(p->decoder=getDecore_ptr(sh->fourcc))) {
char *p=(char *)&(sh->fourcc);
MSG_ERR("Can't find decoder for %c%c%c%c fourcc\n",p[0],p[1],p[2],p[3]);
Modified: mplayerxp/libmpcodecs/vd_vfw.c
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpcodecs/vd_vfw.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -128,8 +128,7 @@
return 0;
}
- priv->o_bih=mp_malloc(temp_len);
- memset(priv->o_bih, 0, temp_len);
+ priv->o_bih=mp_mallocz(temp_len);
priv->o_bih->biSize = temp_len;
ret = ICDecompressGetFormat(priv->hic, sh_video->bih, priv->o_bih);
Modified: mplayerxp/libmpcodecs/vd_xvid.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpcodecs/vd_xvid.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -363,8 +363,7 @@
,xvid_gbl_info.num_threads
,xvid_gbl_info.cpu_flags);
- p = mp_malloc(sizeof(priv_t));
- memset(p,0,sizeof(priv_t));
+ p = mp_mallocz(sizeof(priv_t));
p->cs = cs;
p->hdl = dec_p.handle;
p->vo_initialized = 0;
Modified: mplayerxp/libmpconf/m_struct.c
===================================================================
--- mplayerxp/libmpconf/m_struct.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpconf/m_struct.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -43,7 +43,7 @@
r = mp_calloc(1,st->size);
memcpy(r,st->defaults,st->size);
-
+
for(i = 0 ; st->fields[i].name ; i++) {
if(st->fields[i].type->flags & M_OPT_TYPE_DYNAMIC)
memset(M_ST_MB_P(r,st->fields[i].p),0,st->fields[i].type->size);
@@ -106,7 +106,7 @@
m_struct_copy(const m_struct_t* st, any_t* obj) {
any_t* r = mp_malloc(st->size);
int i;
-
+
memcpy(r,obj,st->size);
for(i = 0 ; st->fields[i].name ; i++) {
if(st->fields[i].type->flags & M_OPT_TYPE_DYNAMIC)
Modified: mplayerxp/libmpdemux/cache2.c
===================================================================
--- mplayerxp/libmpdemux/cache2.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/cache2.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -194,15 +194,14 @@
static cache_vars_t* __FASTCALL__ c2_cache_init(int size,int sector){
pthread_mutex_t tmpl=PTHREAD_MUTEX_INITIALIZER;
- cache_vars_t* c=mp_malloc(sizeof(cache_vars_t));
+ cache_vars_t* c=mp_mallocz(sizeof(cache_vars_t));
char *pmem;
unsigned i,num;
- memset(c,0,sizeof(cache_vars_t));
c->npackets=num=size/sector;
/* collection of all c2_packets in continuous memory area minimizes cache pollution
and speedups cache as C+D=3.27% instead of 4.77% */
i=sizeof(cache_packet_t)*num;
- c->packets=mp_malloc(i);
+ c->packets=mp_mallocz(i);
c->mem=mp_malloc(num*sector);
if(!c->packets || !c->mem)
{
@@ -210,7 +209,6 @@
mp_free(c);
return 0;
}
- memset(c->packets,0,i);
pmem = c->mem;
MSG_DBG2("For cache navigation was allocated %u bytes as %u packets (%u/%u)\n",i,num,size,sector);
c->first=c->last=0;
Modified: mplayerxp/libmpdemux/cdda.c
===================================================================
--- mplayerxp/libmpdemux/cdda.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/cdda.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -80,8 +80,7 @@
unsigned char arr[256];
int st_inited;
- priv = (cdda_priv*)mp_malloc(sizeof(cdda_priv));
- memset(priv, 0, sizeof(cdda_priv));
+ priv = (cdda_priv*)mp_mallocz(sizeof(cdda_priv));
priv->cd = cdio_cddap_identify(dev,mp_conf.verbose?1:0,NULL);
Modified: mplayerxp/libmpdemux/cddb.c
===================================================================
--- mplayerxp/libmpdemux/cddb.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/cddb.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -574,14 +574,12 @@
cd_info_t* __FASTCALL__ cd_info_new() {
cd_info_t *cd_info = NULL;
- cd_info = (cd_info_t*)mp_malloc(sizeof(cd_info_t));
+ cd_info = (cd_info_t*)mp_mallocz(sizeof(cd_info_t));
if( cd_info==NULL ) {
MSG_FATAL("Memory allocation failed\n");
return NULL;
}
- memset(cd_info, 0, sizeof(cd_info_t));
-
return cd_info;
}
@@ -606,13 +604,11 @@
if( cd_info==NULL || track_name==NULL ) return NULL;
- cd_track = (cd_track_t*)mp_malloc(sizeof(cd_track_t));
+ cd_track = (cd_track_t*)mp_mallocz(sizeof(cd_track_t));
if( cd_track==NULL ) {
MSG_FATAL("Memory allocation failed\n");
return NULL;
}
- memset(cd_track, 0, sizeof(cd_track_t));
-
cd_track->name = (char*)mp_malloc(strlen(track_name)+1);
if( cd_track->name==NULL ) {
MSG_FATAL("Memory allocation failed\n");
Modified: mplayerxp/libmpdemux/demux_aiff.c
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_aiff.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -52,8 +52,7 @@
s = demuxer->stream;
sh_audio = new_sh_audio(demuxer,0);
- priv=demuxer->priv=mp_malloc(sizeof(priv_t));
- memset(priv,0,sizeof(priv_t));
+ priv=demuxer->priv=mp_mallocz(sizeof(priv_t));
sh_audio->wf = w = (WAVEFORMATEX*)mp_malloc(sizeof(WAVEFORMATEX));
w->wFormatTag = 0x1; sh_audio->wtag = mmioFOURCC('r','a','w',' '); /* S16BE */
w->nChannels = sh_audio->channels =
Modified: mplayerxp/libmpdemux/demux_audio.c
===================================================================
--- mplayerxp/libmpdemux/demux_audio.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_audio.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -865,9 +865,8 @@
assert(demuxer != NULL);
assert(demuxer->stream != NULL);
#endif
-
- priv = (da_priv_t*)mp_malloc(sizeof(da_priv_t));
- memset(priv,0,sizeof(da_priv_t));
+
+ priv = (da_priv_t*)mp_mallocz(sizeof(da_priv_t));
s = demuxer->stream;
stream_reset(s);
stream_seek(s,s->start_pos);
Modified: mplayerxp/libmpdemux/demux_avi.c
===================================================================
--- mplayerxp/libmpdemux/demux_avi.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_avi.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -289,10 +289,8 @@
print_avisuperindex_chunk(s);
msize = sizeof (uint32_t) * s->wLongsPerEntry * s->nEntriesInUse;
- s->aIndex = mp_malloc(msize);
- memset (s->aIndex, 0, msize);
- s->stdidx = mp_malloc (s->nEntriesInUse * sizeof (avistdindex_chunk));
- memset (s->stdidx, 0, s->nEntriesInUse * sizeof (avistdindex_chunk));
+ s->aIndex = mp_mallocz(msize);
+ s->stdidx = mp_mallocz(s->nEntriesInUse * sizeof (avistdindex_chunk));
// now the real index of indices
for (i=0; i<s->nEntriesInUse; i++) {
@@ -309,8 +307,7 @@
break; }
case ckidSTREAMFORMAT: { // read 'strf'
if(last_fccType==streamtypeVIDEO){
- sh_video->bih=mp_calloc((chunksize<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):chunksize,1);
-// sh_video->bih=mp_malloc(chunksize); memset(sh_video->bih,0,chunksize);
+ sh_video->bih=mp_mallocz((chunksize<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):chunksize);
MSG_V("found 'bih', %u bytes of %d\n",chunksize,sizeof(BITMAPINFOHEADER));
stream_read(demuxer->stream,(char*) sh_video->bih,chunksize);
le2me_BITMAPINFOHEADER(sh_video->bih); // swap to machine endian
@@ -363,8 +360,7 @@
} else
if(last_fccType==streamtypeAUDIO){
unsigned wf_size = chunksize<sizeof(WAVEFORMATEX)?sizeof(WAVEFORMATEX):chunksize;
- sh_audio->wf=mp_calloc(wf_size,1);
-// sh_audio->wf=mp_malloc(chunksize); memset(sh_audio->wf,0,chunksize);
+ sh_audio->wf=mp_mallocz(wf_size);
MSG_V("found 'wf', %d bytes of %d\n",chunksize,sizeof(WAVEFORMATEX));
stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize);
le2me_WAVEFORMATEX(sh_audio->wf);
@@ -1144,10 +1140,9 @@
demux_stream_t *d_video=demuxer->video;
sh_audio_t *sh_audio=NULL;
sh_video_t *sh_video=NULL;
- avi_priv_t* priv=mp_malloc(sizeof(avi_priv_t));
+ avi_priv_t* priv=mp_mallocz(sizeof(avi_priv_t));
// priv struct:
- memset(priv,0,sizeof(avi_priv_t));
demuxer->priv=(any_t*)priv;
//---- AVI header:
Modified: mplayerxp/libmpdemux/demux_dv.c
===================================================================
--- mplayerxp/libmpdemux/demux_dv.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_dv.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -210,8 +210,7 @@
// custom fourcc for internal MPlayer use
sh_audio->wtag = mmioFOURCC('R', 'A', 'D', 'V');
- sh_audio->wf = mp_malloc(sizeof(WAVEFORMATEX));
- memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX));
+ sh_audio->wf = mp_mallocz(sizeof(WAVEFORMATEX));
sh_audio->wf->wFormatTag = sh_audio->wtag;
sh_audio->wf->nChannels = dv_decoder->audio->num_channels;
sh_audio->wf->wBitsPerSample = 16;
Modified: mplayerxp/libmpdemux/demux_mkv.c
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_mkv.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -2281,7 +2281,7 @@
mkv_d->audio_tracks[mkv_d->last_aid] = track->tnum;
sh_a->ds = demuxer->audio;
- sh_a->wf = mp_malloc (sizeof (WAVEFORMATEX));
+ sh_a->wf = mp_mallocz (sizeof (WAVEFORMATEX));
if (track->ms_compat && (track->private_size >= sizeof(WAVEFORMATEX)))
{
WAVEFORMATEX *wf = (WAVEFORMATEX *)track->private_data;
@@ -2304,7 +2304,6 @@
}
else
{
- memset(sh_a->wf, 0, sizeof (WAVEFORMATEX));
if (!strcmp(track->codec_id, MKV_A_MP3) ||
!strcmp(track->codec_id, MKV_A_MP2))
track->a_formattag = 0x0055;
Modified: mplayerxp/libmpdemux/demux_mov.c
===================================================================
--- mplayerxp/libmpdemux/demux_mov.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_mov.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -302,12 +302,10 @@
int flags=0;
int no=0;
unsigned ver;
- mov_priv_t* priv=mp_malloc(sizeof(mov_priv_t));
+ mov_priv_t* priv=mp_mallocz(sizeof(mov_priv_t));
MSG_V("Checking for MOV\n");
- memset(priv,0,sizeof(mov_priv_t));
-
while(1){
int i;
int skipped=8;
@@ -611,8 +609,7 @@
return;
}
if(!priv->track_db) MSG_V("--------------\n");
- trak=mp_malloc(sizeof(mov_track_t));
- memset(trak,0,sizeof(mov_track_t));
+ trak=mp_mallocz(sizeof(mov_track_t));
MSG_V("MOV: Track #%d:\n",priv->track_db);
trak->id=priv->track_db;
priv->tracks[priv->track_db]=trak;
@@ -917,8 +914,7 @@
}
MSG_V("Fourcc: %.4s\n",&trak->fourcc);
// Emulate WAVEFORMATEX struct:
- sh->wf=mp_malloc(sizeof(WAVEFORMATEX));
- memset(sh->wf,0,sizeof(WAVEFORMATEX));
+ sh->wf=mp_mallocz(sizeof(WAVEFORMATEX));
sh->wf->wFormatTag=afourcc2wtag(sh->wtag);
sh->wf->nChannels=sh->channels;
sh->wf->wBitsPerSample=(trak->stdata[18]<<8)+trak->stdata[19];
@@ -1147,8 +1143,7 @@
// emulate BITMAPINFOHEADER:
if (palette_count)
{
- sh->bih=mp_malloc(sizeof(BITMAPINFOHEADER) + palette_count * 4);
- memset(sh->bih,0,sizeof(BITMAPINFOHEADER) + palette_count * 4);
+ sh->bih=mp_mallocz(sizeof(BITMAPINFOHEADER) + palette_count * 4);
sh->bih->biSize=40 + palette_count * 4;
// fetch the relevant fields
flag = BE_16(trak->stdata[hdr_ptr]);
@@ -1235,16 +1230,14 @@
MSG_ERR( "Invalid extradata size %d, skipping\n",trak->stream_header_len);
trak->stream_header_len = 0;
}
- sh->bih=mp_malloc(sizeof(BITMAPINFOHEADER) + trak->stream_header_len);
- memset(sh->bih,0,sizeof(BITMAPINFOHEADER) + trak->stream_header_len);
+ sh->bih=mp_mallocz(sizeof(BITMAPINFOHEADER) + trak->stream_header_len);
sh->bih->biSize=40 + trak->stream_header_len;
memcpy(((unsigned char *)sh->bih)+40, trak->stream_header, trak->stream_header_len);
mp_free (trak->stream_header);
trak->stream_header_len = 0;
trak->stream_header = NULL;
} else {
- sh->bih=mp_malloc(sizeof(BITMAPINFOHEADER));
- memset(sh->bih,0,sizeof(BITMAPINFOHEADER));
+ sh->bih=mp_mallocz(sizeof(BITMAPINFOHEADER));
sh->bih->biSize=40;
}
}
Modified: mplayerxp/libmpdemux/demux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -466,8 +466,7 @@
hsize=stream_read_qword_le(s); /* header size */
// priv struct:
- priv=mp_malloc(sizeof(mpxpav64_priv_t));
- memset(priv,0,sizeof(mpxpav64_priv_t));
+ priv=mp_mallocz(sizeof(mpxpav64_priv_t));
demuxer->priv=(any_t*)priv;
demuxer->video->id=-1;
demuxer->audio->id=-1;
Modified: mplayerxp/libmpdemux/demux_nuv.c
===================================================================
--- mplayerxp/libmpdemux/demux_nuv.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_nuv.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -265,9 +265,8 @@
sh_audio->wtag = 0x1;
sh_audio->channels = 2;
sh_audio->samplerate = 44100;
-
- sh_audio->wf = mp_malloc(sizeof(WAVEFORMATEX));
- memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX));
+
+ sh_audio->wf = mp_mallocz(sizeof(WAVEFORMATEX));
sh_audio->wf->wFormatTag = sh_audio->wtag;
sh_audio->wf->nChannels = sh_audio->channels;
sh_audio->wf->wBitsPerSample = 16;
Modified: mplayerxp/libmpdemux/demux_pva.c
===================================================================
--- mplayerxp/libmpdemux/demux_pva.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_pva.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -129,20 +129,19 @@
static demuxer_t* pva_open (demuxer_t * demuxer)
{
sh_video_t *sh_video = new_sh_video(demuxer,0);
- sh_audio_t *sh_audio = new_sh_audio(demuxer,0);
+ sh_audio_t *sh_audio = new_sh_audio(demuxer,0);
-
+
pva_priv_t * priv;
-
+
stream_reset(demuxer->stream);
stream_seek(demuxer->stream,0);
- priv=mp_malloc(sizeof(pva_priv_t));
+ priv=mp_mallocz(sizeof(pva_priv_t));
demuxer->flags|=DEMUXF_SEEKABLE;
-
+
demuxer->priv=priv;
- memset(demuxer->priv,0,sizeof(pva_priv_t));
-
+
if(!pva_sync(demuxer))
{
MSG_ERR("Not a PVA file.\n");
@@ -150,36 +149,36 @@
}
//printf("priv->just_synced %s after initial sync!\n",priv->just_synced?"set":"UNSET");
-
+
demuxer->video->sh=sh_video;
-
+
//printf("demuxer->stream->end_pos= %d\n",demuxer->stream->end_pos);
-
+
MSG_V("Opened PVA demuxer...\n");
-
+
/*
* Audio and Video codecs:
* the PVA spec only allows MPEG2 video and MPEG layer II audio. No need to check the formats then.
* Moreover, there would be no way to do that since the PVA stream format has no fields to describe
* the used codecs.
*/
-
+
sh_video->fourcc=0x10000002;
sh_video->ds=demuxer->video;
-
+
/*
printf("demuxer->video->id==%d\n",demuxer->video->id);
printf("demuxer->audio->id==%d\n",demuxer->audio->id);
*/
-
+
demuxer->audio->sh=sh_audio;
sh_audio->wtag=0x50;
sh_audio->ds=demuxer->audio;
-
+
demuxer->movi_start=0;
demuxer->movi_end=demuxer->stream->end_pos;
-
+
priv->last_video_pts=-1;
priv->last_audio_pts=-1;
Modified: mplayerxp/libmpdemux/demux_ra.c
===================================================================
--- mplayerxp/libmpdemux/demux_ra.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_ra.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -99,11 +99,10 @@
int i;
char *buf;
- if ((ra_priv = (ra_priv_t *)mp_malloc(sizeof(ra_priv_t))) == NULL) {
- MSG_ERR(MSGTR_OutOfMemory);
- return 0;
- }
- memset(ra_priv, 0, sizeof(ra_priv_t));
+ if ((ra_priv = (ra_priv_t *)mp_mallocz(sizeof(ra_priv_t))) == NULL) {
+ MSG_ERR(MSGTR_OutOfMemory);
+ return 0;
+ }
demuxer->priv = ra_priv;
sh = new_sh_audio(demuxer, 0);
@@ -225,8 +224,7 @@
}
/* Fill WAVEFORMATEX */
- sh->wf = mp_malloc(sizeof(WAVEFORMATEX));
- memset(sh->wf, 0, sizeof(WAVEFORMATEX));
+ sh->wf = mp_mallocz(sizeof(WAVEFORMATEX));
sh->wf->nChannels = sh->channels;
sh->wf->wBitsPerSample = sh->samplesize;
sh->wf->nSamplesPerSec = sh->samplerate;
Modified: mplayerxp/libmpdemux/demux_real.c
===================================================================
--- mplayerxp/libmpdemux/demux_real.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_real.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -323,8 +323,7 @@
if (c != MKTAG('.', 'R', 'M', 'F'))
return 0; /* bad magic */
- priv = mp_malloc(sizeof(real_priv_t));
- memset(priv, 0, sizeof(real_priv_t));
+ priv = mp_mallocz(sizeof(real_priv_t));
demuxer->priv = priv;
demuxer->file_format=DEMUXER_TYPE_REAL;
return 1;
@@ -1076,8 +1075,7 @@
}
/* Emulate WAVEFORMATEX struct: */
- sh->wf = mp_malloc(sizeof(WAVEFORMATEX));
- memset(sh->wf, 0, sizeof(WAVEFORMATEX));
+ sh->wf = mp_mallocz(sizeof(WAVEFORMATEX));
sh->wf->nChannels = sh->channels;
sh->wf->wBitsPerSample = sh->samplesize*8;
sh->wf->nSamplesPerSec = sh->samplerate;
@@ -1179,8 +1177,7 @@
sh_audio_t *sh = new_sh_audio(demuxer, stream_id);
/* Emulate WAVEFORMATEX struct: */
- sh->wf = mp_malloc(sizeof(WAVEFORMATEX));
- memset(sh->wf, 0, sizeof(WAVEFORMATEX));
+ sh->wf = mp_mallocz(sizeof(WAVEFORMATEX));
sh->wf->nChannels = 0;//sh->channels;
sh->wf->wBitsPerSample = 16;
sh->wf->nSamplesPerSec = 0;//sh->samplerate;
Modified: mplayerxp/libmpdemux/demux_smjpeg.c
===================================================================
--- mplayerxp/libmpdemux/demux_smjpeg.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_smjpeg.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -120,10 +120,9 @@
sh_video = new_sh_video(demuxer, 0);
demuxer->video->sh = sh_video;
sh_video->ds = demuxer->video;
-
- sh_video->bih = mp_malloc(sizeof(BITMAPINFOHEADER));
- memset(sh_video->bih, 0, sizeof(BITMAPINFOHEADER));
+ sh_video->bih = mp_mallocz(sizeof(BITMAPINFOHEADER));
+
stream_skip(demuxer->stream, 4); /* number of frames */
// sh_video->fps = 24;
sh_video->src_w = stream_read_word(demuxer->stream);
@@ -144,9 +143,8 @@
demuxer->audio->sh = sh_audio;
sh_audio->ds = demuxer->audio;
- sh_audio->wf = mp_malloc(sizeof(WAVEFORMATEX));
- memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX));
-
+ sh_audio->wf = mp_mallocz(sizeof(WAVEFORMATEX));
+
sh_audio->samplerate = stream_read_word(demuxer->stream);
sh_audio->wf->wBitsPerSample = stream_read_char(demuxer->stream);
sh_audio->channels = stream_read_char(demuxer->stream);
Modified: mplayerxp/libmpdemux/demux_ts.c
===================================================================
--- mplayerxp/libmpdemux/demux_ts.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_ts.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -2064,10 +2064,9 @@
{
ES_stream_t *tss;
- tss = mp_malloc(sizeof(ES_stream_t));
+ tss = mp_mallocz(sizeof(ES_stream_t));
if(! tss)
return NULL;
- memset(tss, 0, sizeof(ES_stream_t));
tss->pid = pid;
tss->last_cc = -1;
tss->type = UNKNOWN;
Modified: mplayerxp/libmpdemux/demux_viv.c
===================================================================
--- mplayerxp/libmpdemux/demux_viv.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_viv.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -112,8 +112,7 @@
if (!demux->priv)
{
- priv = mp_malloc(sizeof(vivo_priv_t));
- memset(priv, 0, sizeof(vivo_priv_t));
+ priv = mp_mallocz(sizeof(vivo_priv_t));
demux->priv = priv;
priv->supported = 0;
}
@@ -268,8 +267,7 @@
MSG_DBG2("header block 1 size: %d\n",len);
//stream_skip(demuxer->stream,len);
- priv=mp_malloc(sizeof(vivo_priv_t));
- memset(priv,0,sizeof(vivo_priv_t));
+ priv=mp_mallocz(sizeof(vivo_priv_t));
demuxer->priv=priv;
#if 0
@@ -607,8 +605,7 @@
sh->src_h = height;
// emulate BITMAPINFOHEADER:
- sh->bih=mp_malloc(sizeof(BITMAPINFOHEADER));
- memset(sh->bih,0,sizeof(BITMAPINFOHEADER));
+ sh->bih=mp_mallocz(sizeof(BITMAPINFOHEADER));
sh->bih->biSize=40;
if (priv->width)
sh->bih->biWidth = priv->width;
@@ -672,8 +669,7 @@
}
// Emulate WAVEFORMATEX struct:
- sh->wf=mp_malloc(sizeof(WAVEFORMATEX));
- memset(sh->wf,0,sizeof(WAVEFORMATEX));
+ sh->wf=mp_mallocz(sizeof(WAVEFORMATEX));
sh->wf->wFormatTag=sh->wtag;
sh->wf->nChannels=1; /* 1 channels for both Siren and G.723 */
Modified: mplayerxp/libmpdemux/demux_vqf.c
===================================================================
--- mplayerxp/libmpdemux/demux_vqf.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_vqf.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -53,9 +53,8 @@
s = demuxer->stream;
sh_audio = new_sh_audio(demuxer,0);
- sh_audio->wf = w = (WAVEFORMATEX*)mp_malloc(sizeof(WAVEFORMATEX)+sizeof(headerInfo));
+ sh_audio->wf = w = (WAVEFORMATEX*)mp_mallocz(sizeof(WAVEFORMATEX)+sizeof(headerInfo));
hi = (headerInfo *)&w[1];
- memset(hi,0,sizeof(headerInfo));
w->wFormatTag = 0x1; sh_audio->wtag = mmioFOURCC('T','W','I','N'); /* TWinVQ */
w->nChannels = sh_audio->channels = 2;
w->nSamplesPerSec = sh_audio->samplerate = 44100;
Modified: mplayerxp/libmpdemux/demux_y4m.c
===================================================================
--- mplayerxp/libmpdemux/demux_y4m.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demux_y4m.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -206,8 +206,7 @@
sh->fourcc = mmioFOURCC('Y', 'V', '1', '2');
- sh->bih=mp_malloc(sizeof(BITMAPINFOHEADER));
- memset(sh->bih,0,sizeof(BITMAPINFOHEADER));
+ sh->bih=mp_mallocz(sizeof(BITMAPINFOHEADER));
sh->bih->biSize=40;
sh->bih->biWidth = sh->src_w;
sh->bih->biHeight = sh->src_h;
Modified: mplayerxp/libmpdemux/demuxer.c
===================================================================
--- mplayerxp/libmpdemux/demuxer.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/demuxer.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -138,8 +138,7 @@
}
demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id){
- demuxer_t *d=mp_malloc(sizeof(demuxer_t));
- memset(d,0,sizeof(demuxer_t));
+ demuxer_t *d=mp_mallocz(sizeof(demuxer_t));
d->stream=stream;
d->movi_start=stream->start_pos;
d->movi_end=stream->end_pos;
@@ -151,8 +150,7 @@
d->video=new_demuxer_stream(d,v_id);
d->sub=new_demuxer_stream(d,s_id);
d->file_format=type;
- d->info=mp_malloc(sizeof(demuxer_info_t));
- memset(d->info,0,sizeof(demuxer_info_t));
+ d->info=mp_mallocz(sizeof(demuxer_info_t));
stream_reset(stream);
stream_seek(stream,stream->start_pos);
return d;
Modified: mplayerxp/libmpdemux/http.c
===================================================================
--- mplayerxp/libmpdemux/http.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/http.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -20,9 +20,8 @@
http_new_header() {
HTTP_header_t *http_hdr;
- http_hdr = (HTTP_header_t*)mp_malloc(sizeof(HTTP_header_t));
+ http_hdr = (HTTP_header_t*)mp_mallocz(sizeof(HTTP_header_t));
if( http_hdr==NULL ) return NULL;
- memset( http_hdr, 0, sizeof(HTTP_header_t) );
return http_hdr;
}
Modified: mplayerxp/libmpdemux/librtsp/rtsp_rtp.c
===================================================================
--- mplayerxp/libmpdemux/librtsp/rtsp_rtp.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/librtsp/rtsp_rtp.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -610,7 +610,7 @@
is_multicast ? RTSP_MULTICAST_PORT : RTSP_UNICAST_CLIENT_PORT,
client_rtp_port, client_rtcp_port);
MSG_V("RTSP Transport: %s\n", temp_buf);
-
+
rtsp_unschedule_field (rtsp_session, RTSP_SESSION);
rtsp_schedule_field (rtsp_session, temp_buf);
Modified: mplayerxp/libmpdemux/mux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/mux_mpxp64.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/mux_mpxp64.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -168,17 +168,14 @@
MSG_ERR("Too many streams! increase MUXER_MAX_STREAMS !\n");
return NULL;
}
- s=mp_malloc(sizeof(muxer_stream_t));
- memset(s,0,sizeof(muxer_stream_t));
+ s=mp_mallocz(sizeof(muxer_stream_t));
if(!s) return NULL; // no mem!?
if(!muxer->priv)
{
- muxer->priv=mp_malloc(sizeof(priv_mpxpav64_t));
- memset(muxer->priv,0,sizeof(priv_mpxpav64_t));
+ muxer->priv=mp_mallocz(sizeof(priv_mpxpav64_t));
((priv_mpxpav64_t *)muxer->priv)->prev_seek=-SEEKPOINT_THRESHOLD*2;
}
- s->priv=mp_malloc(sizeof(priv_mpxpav64_stream_t));
- memset(s->priv,0,sizeof(priv_mpxpav64_stream_t));
+ s->priv=mp_mallocz(sizeof(priv_mpxpav64_stream_t));
muxer->streams[muxer->avih.dwStreams]=s;
s->type=type;
s->id=muxer->avih.dwStreams;
Modified: mplayerxp/libmpdemux/mux_raw.c
===================================================================
--- mplayerxp/libmpdemux/mux_raw.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/mux_raw.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -35,16 +35,14 @@
MSG_ERR("Too many streams! increase MUXER_MAX_STREAMS !\n");
return NULL;
}
- s=mp_malloc(sizeof(muxer_stream_t));
- memset(s,0,sizeof(muxer_stream_t));
+ s=mp_mallocz(sizeof(muxer_stream_t));
if(!s) return NULL; // no mem!?
muxer->streams[muxer->avih.dwStreams]=s;
s->type=type;
s->id=muxer->avih.dwStreams;
s->timer=0.0;
s->muxer=muxer;
- s->priv=mp_malloc(sizeof(priv_raw_stream_t));
- memset(s->priv,0,sizeof(priv_raw_stream_t));
+ s->priv=mp_mallocz(sizeof(priv_raw_stream_t));
s->size=0;
switch(type){
case MUXER_TYPE_VIDEO:
Modified: mplayerxp/libmpdemux/muxer.c
===================================================================
--- mplayerxp/libmpdemux/muxer.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/muxer.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -35,8 +35,7 @@
}
muxer_t *muxer_new_muxer(const char *type,const char *subtype,FILE *f){
- muxer_t* muxer=mp_malloc(sizeof(muxer_t));
- memset(muxer,0,sizeof(muxer_t));
+ muxer_t* muxer=mp_mallocz(sizeof(muxer_t));
muxer->file = f;
// if(!strcmp(type,"lavf")) { if(!muxer_init_muxer_lavf(muxer,subtype)) { mp_free(muxer); muxer=NULL; }}
// else
Modified: mplayerxp/libmpdemux/network.c
===================================================================
--- mplayerxp/libmpdemux/network.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/network.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -94,12 +94,11 @@
streaming_ctrl_t * streaming_ctrl_new(void) {
streaming_ctrl_t *streaming_ctrl;
- streaming_ctrl = (streaming_ctrl_t*)mp_malloc(sizeof(streaming_ctrl_t));
+ streaming_ctrl = (streaming_ctrl_t*)mp_mallocz(sizeof(streaming_ctrl_t));
if( streaming_ctrl==NULL ) {
MSG_FATAL(MSGTR_OutOfMemory);
return NULL;
}
- memset( streaming_ctrl, 0, sizeof(streaming_ctrl_t) );
return streaming_ctrl;
}
Modified: mplayerxp/libmpdemux/parse_mp4.c
===================================================================
--- mplayerxp/libmpdemux/parse_mp4.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/parse_mp4.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -39,11 +39,11 @@
uint8_t len;
#ifdef MP4_DUMPATOM
{int i;
- MSG_DBG2("ESDS Dump (%dbyte):\n", datalen);
+ MSG_DBG2("ESDS Dump (%dbyte):\n", datalen);
for(i = 0; i < datalen; i++)
MSG_DBG2("%02X ", data[i]);
MSG_DBG2("\nESDS Dumped\n");}
-#endif
+#endif
memset(esds, 0, sizeof(esds_t));
esds->version = stream_read_char(s);
Modified: mplayerxp/libmpdemux/s_dvdread.c
===================================================================
--- mplayerxp/libmpdemux/s_dvdread.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/s_dvdread.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -709,9 +709,9 @@
return 0;
}
--dvd_angle; // remap 1.. -> 0..
-
+
// store data
- d=mp_malloc(sizeof(dvd_priv_t)); memset(d,0,sizeof(dvd_priv_t));
+ d=mp_mallocz(sizeof(dvd_priv_t));
d->dvd=dvd;
d->title=0;
d->vmg_file=vmg_file;
Modified: mplayerxp/libmpdemux/s_ftp.c
===================================================================
--- mplayerxp/libmpdemux/s_ftp.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/s_ftp.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -371,8 +371,7 @@
MSG_ERR("[ftp] Bad url\n");
return 0;
}
- p=stream->priv=mp_malloc(sizeof(struct stream_priv_s));
- memset(p,0,sizeof(struct stream_priv_s));
+ p=stream->priv=mp_mallocz(sizeof(struct stream_priv_s));
p->user=url->username?url->username:"anonymous";
p->pass=url->password?url->password:"no@spam";
p->host=url->hostname;
Modified: mplayerxp/libmpdemux/stream.c
===================================================================
--- mplayerxp/libmpdemux/stream.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/stream.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -219,9 +219,8 @@
}
stream_t* __FASTCALL__ new_memory_stream(const unsigned char* data,int len){
- stream_t *s=mp_malloc(sizeof(stream_t)+len);
+ stream_t *s=mp_mallocz(sizeof(stream_t)+len);
if(s==NULL) return NULL;
- memset(s,0,sizeof(stream_t));
s->fd=-1;
s->type=STREAMTYPE_MEMORY;
s->buf_pos=0; s->buf_len=len;
@@ -236,10 +235,9 @@
}
stream_t* __FASTCALL__ new_stream(int type){
- stream_t *s=mp_malloc(sizeof(stream_t));
+ stream_t *s=mp_mallocz(sizeof(stream_t));
if(s==NULL) return NULL;
- memset(s,0,sizeof(stream_t));
-
+
s->fd=-1;
s->type=type;
s->sector_size=STREAM_BUFFER_SIZE;
Modified: mplayerxp/libmpdemux/sub_cc.c
===================================================================
--- mplayerxp/libmpdemux/sub_cc.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/sub_cc.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -112,8 +112,7 @@
if(!bb->lines) {bb->lines++; cursor_pos=0;}
if(bb->text[bb->lines - 1]==NULL)
{
- bb->text[bb->lines - 1]=mp_malloc(CC_MAX_LINE_LENGTH);
- memset(bb->text[bb->lines - 1],0,CC_MAX_LINE_LENGTH);
+ bb->text[bb->lines - 1]=mp_mallocz(CC_MAX_LINE_LENGTH);
cursor_pos=0;
}
Modified: mplayerxp/libmpdemux/sub_ty.c
===================================================================
--- mplayerxp/libmpdemux/sub_ty.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/sub_ty.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -224,9 +224,9 @@
if ( CC_mode != CURRENT ) return 0;
}
-
+
// preamble address code (row & indent)
- if ( b2 & 0x40 )
+ if ( b2 & 0x40 )
{
TY_CC_CUR_Y = CC_row[ ( ( b1 << 1 ) & 14 ) | ( ( b2 >> 5 ) & 1 ) ];
@@ -443,7 +443,7 @@
TY_CC_CUR_X = 1;
TY_CC_CUR_Y = -1;
-
+
TY_CC_ptr = TY_CC_buf;
memset( TY_CC_buf, 0, sizeof( TY_CC_buf ) );
}
Modified: mplayerxp/libmpdemux/tvi_dummy.c
===================================================================
--- mplayerxp/libmpdemux/tvi_dummy.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/tvi_dummy.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -126,13 +126,12 @@
if (!h)
return(NULL);
- h->priv = (priv_t *)mp_malloc(sizeof(priv_t));
+ h->priv = (priv_t *)mp_mallocz(sizeof(priv_t));
if (!h->priv)
{
mp_free(h);
return(NULL);
}
- memset(h->priv, 0, sizeof(priv_t));
h->info = &info;
h->functions = &functions;
h->seq = 0;
Modified: mplayerxp/libmpdemux/tvi_v4l.c
===================================================================
--- mplayerxp/libmpdemux/tvi_v4l.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libmpdemux/tvi_v4l.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -224,10 +224,9 @@
priv->height = priv->capability.minheight;
MSG_V( " Inputs: %d\n", priv->capability.channels);
- priv->channels = (struct video_channel *)mp_malloc(sizeof(struct video_channel)*priv->capability.channels);
+ priv->channels = (struct video_channel *)mp_mallocz(sizeof(struct video_channel)*priv->capability.channels);
if (!priv->channels)
goto malloc_failed;
- memset(priv->channels, 0, sizeof(struct video_channel)*priv->capability.channels);
for (i = 0; i < priv->capability.channels; i++)
{
priv->channels[i].channel = i;
@@ -334,11 +333,9 @@
priv->nbuf = priv->mbuf.frames;
/* video buffers */
- priv->buf = (struct video_mmap *)mp_malloc(priv->nbuf * sizeof(struct video_mmap));
+ priv->buf = (struct video_mmap *)mp_mallocz(priv->nbuf * sizeof(struct video_mmap));
if (!priv->buf)
goto malloc_failed;
- memset(priv->buf, 0, priv->nbuf * sizeof(struct video_mmap));
-
/* audio init */
#if 1
priv->audio_fd = open(priv->audio_device, O_RDONLY);
Modified: mplayerxp/libvo/font_load.c
===================================================================
--- mplayerxp/libvo/font_load.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/font_load.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -53,8 +53,7 @@
int fontdb=-1;
int version=0;
-desc=mp_malloc(sizeof(font_desc_t));if(!desc) return NULL;
-memset(desc,0,sizeof(font_desc_t));
+desc=mp_mallocz(sizeof(font_desc_t));if(!desc) return NULL;
f=fopen(fname,"rt");if(!f){ MSG_ERR("font: can't open file: %s\n",fname); mp_free(desc); return NULL;}
Modified: mplayerxp/libvo/sub.c
===================================================================
--- mplayerxp/libvo/sub.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/sub.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -411,8 +411,7 @@
}
mp_osd_obj_t* __FASTCALL__ new_osd_obj(int type){
- mp_osd_obj_t* osd=mp_malloc(sizeof(mp_osd_obj_t));
- memset(osd,0,sizeof(mp_osd_obj_t));
+ mp_osd_obj_t* osd=mp_mallocz(sizeof(mp_osd_obj_t));
osd->next=vo_osd_list;
vo_osd_list=osd;
osd->type=type;
Modified: mplayerxp/libvo/video_out.c
===================================================================
--- mplayerxp/libvo/video_out.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/video_out.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -181,14 +181,12 @@
vo_conf.da_buffs=64;
vo_conf.WinID=-1;
- vo=mp_malloc(sizeof(vo_data_t));
- memset(vo,0,sizeof(vo_data_t));
+ vo=mp_mallocz(sizeof(vo_data_t));
vo->window = None;
vo->osd_progbar_type=-1;
vo->osd_progbar_value=100; // 0..256
- vo->vo_priv=mp_malloc(sizeof(vo_priv_t));
- memset(vo->vo_priv,0,sizeof(vo_priv_t));
+ vo->vo_priv=mp_mallocz(sizeof(vo_priv_t));
vo_priv_t* priv=(vo_priv_t*)vo->vo_priv;
pthread_mutexattr_init(&attr);
pthread_mutex_init(&priv->surfaces_mutex,&attr);
Modified: mplayerxp/libvo/vo_dga.c
===================================================================
--- mplayerxp/libvo/vo_dga.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/vo_dga.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -752,9 +752,8 @@
MSG_V( "vo_dga: Unknown subdevice: %s\n",arg);
return ENOSYS;
}
- vo->priv=mp_malloc(sizeof(priv_t));
+ vo->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=(priv_t*)vo->priv;
- memset(priv,0,sizeof(priv_t));
priv->num_buffers=1;
return 0;
}
Modified: mplayerxp/libvo/vo_fbdev.c
===================================================================
--- mplayerxp/libvo/vo_fbdev.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/vo_fbdev.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -1111,9 +1111,8 @@
static uint32_t __FASTCALL__ preinit(vo_data_t*vo,const char *arg)
{
- vo->priv=mp_malloc(sizeof(priv_t));
+ vo->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=(priv_t*)vo->priv;
- memset(priv,0,sizeof(priv_t));
priv_conf.mode_cfgfile = "/etc/priv->modes";
priv->vt_doit = 1;
priv->pre_init_err = 0;
Modified: mplayerxp/libvo/vo_null.c
===================================================================
--- mplayerxp/libvo/vo_null.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/vo_null.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -184,9 +184,7 @@
MSG_ERR("vo_null: Unknown subdevice: %s\n",arg);
return ENOSYS;
}
- vo->priv=mp_malloc(sizeof(priv_t));
- priv_t*priv=(priv_t*)vo->priv;
- memset(priv,0,sizeof(priv_t));
+ vo->priv=mp_mallocz(sizeof(priv_t));
return 0;
}
Modified: mplayerxp/libvo/vo_opengl.c
===================================================================
--- mplayerxp/libvo/vo_opengl.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/vo_opengl.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -332,9 +332,8 @@
static uint32_t __FASTCALL__ preinit(vo_data_t*vo,const char *arg)
{
- vo->priv=mp_malloc(sizeof(priv_t));
+ vo->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=(priv_t*)vo->priv;
- memset(priv,0,sizeof(priv_t));
priv->num_buffers=1;
UNUSED(arg);
if (!vo_x11_init(vo)) return -1;
Modified: mplayerxp/libvo/vo_sdl.c
===================================================================
--- mplayerxp/libvo/vo_sdl.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/vo_sdl.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -1199,11 +1199,8 @@
static uint32_t __FASTCALL__ preinit(vo_data_t*vo,const char *arg)
{
- priv_t *priv = mp_malloc(sizeof(priv_t));
+ priv_t *priv = mp_mallocz(sizeof(priv_t));
vo->priv=priv;
- memset(priv,0,sizeof(priv_t));
- memset(priv->rgbsurface,0,sizeof(priv->rgbsurface));
- memset(priv->overlay,0,sizeof(priv->overlay));
priv->num_buffs = 1;
priv->surface = NULL;
if(arg) strcpy(sdl_subdevice,arg);
Modified: mplayerxp/libvo/vo_vesa.c
===================================================================
--- mplayerxp/libvo/vo_vesa.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/vo_vesa.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -719,9 +719,8 @@
int pre_init_err = 0;
MSG_DBG2("vo_vesa: preinit(%s) was called\n",arg);
MSG_DBG3("vo_vesa: subdevice %s is being initialized\n",arg);
- vo->priv=mp_malloc(sizeof(priv_t));
+ vo->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=(priv_t*)vo->priv;
- memset(priv,0,sizeof(priv_t));
priv->subdev_flags = 0xFFFFFFFEUL;
if(arg) priv->subdev_flags = parseSubDevice(vo,arg);
#ifdef CONFIG_VIDIX
Modified: mplayerxp/libvo/vo_x11.c
===================================================================
--- mplayerxp/libvo/vo_x11.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/vo_x11.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -322,9 +322,8 @@
static uint32_t __FASTCALL__ preinit(vo_data_t*vo,const char *arg)
{
- vo->priv=mp_malloc(sizeof(priv_t));
+ vo->priv=mp_mallocz(sizeof(priv_t));
priv_t* priv=(priv_t*)vo->priv;
- memset(priv,0,sizeof(priv_t));
priv->num_buffers=1;
if(arg)
{
Modified: mplayerxp/libvo/vo_xv.c
===================================================================
--- mplayerxp/libvo/vo_xv.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/vo_xv.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -563,9 +563,8 @@
static uint32_t __FASTCALL__ preinit(vo_data_t*vo,const char *arg)
{
- vo->priv=mp_malloc(sizeof(priv_t));
+ vo->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=(priv_t*)vo->priv;
- memset(priv,0,sizeof(priv_t));
priv->num_buffers=1;
if(arg) {
MSG_ERR("vo_xv: Unknown subdevice: %s\n",arg);
Modified: mplayerxp/libvo/vo_xvidix.c
===================================================================
--- mplayerxp/libvo/vo_xvidix.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/vo_xvidix.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -397,9 +397,8 @@
static uint32_t __FASTCALL__ preinit(vo_data_t*vo,const char *arg)
{
- vo->priv=mp_malloc(sizeof(priv_t));
+ vo->priv=mp_mallocz(sizeof(priv_t));
priv_t*priv=(priv_t*)vo->priv;
- memset(priv,0,sizeof(priv_t));
if (arg)
priv->name = mp_strdup(arg);
else {
Modified: mplayerxp/libvo/vosub_vidix.c
===================================================================
--- mplayerxp/libvo/vosub_vidix.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/vosub_vidix.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -618,10 +618,8 @@
int err;
static int reent=0;
MSG_DBG2("vidix_preinit(%s) was called\n",drvname);
- priv_t* priv=mp_malloc(sizeof(priv_t));
+ priv_t* priv=mp_mallocz(sizeof(priv_t));
vo->priv3=priv;
- memset(priv,0,sizeof(priv_t));
- memset(priv->bm_buffs,0,sizeof(priv->bm_buffs));
ALLOC_VIDIX_STRUCTS()
if(vdlGetVersion() != VIDIX_VERSION) {
MSG_FATAL("You have wrong version of VIDIX library\n");
Modified: mplayerxp/libvo/x11_common.c
===================================================================
--- mplayerxp/libvo/x11_common.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/libvo/x11_common.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -271,9 +271,8 @@
if(vo->depthonscreen) return 1; // already called
- vo->priv2=mp_malloc(sizeof(priv_t));
+ vo->priv2=mp_mallocz(sizeof(priv_t));
priv_t*priv=(priv_t*)vo->priv2;
- memset(priv,0,sizeof(priv_t));
priv->CompletionType=-1;
XSetErrorHandler(x11_errorhandler);
Modified: mplayerxp/loader/dmo/DMO_AudioDecoder.c
===================================================================
--- mplayerxp/loader/dmo/DMO_AudioDecoder.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/loader/dmo/DMO_AudioDecoder.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -49,17 +49,17 @@
#ifdef HAVE_WIN32LOADER
Setup_LDT_Keeper();
Setup_FS_Segment();
-#endif
+#endif
this = mp_malloc(sizeof(DMO_AudioDecoder));
-
+
this->m_iFlushed=1;
-
+
sz = 18 + wf->cbSize;
this->m_sVhdr = mp_malloc(sz);
memcpy(this->m_sVhdr, wf, sz);
this->m_sVhdr2 = mp_malloc(18);
memcpy(this->m_sVhdr2, this->m_sVhdr, 18);
-
+
pWF = (WAVEFORMATEX*)this->m_sVhdr2;
pWF->wFormatTag = 1;
pWF->wBitsPerSample = 16;
@@ -67,7 +67,7 @@
pWF->nBlockAlign = 2*pWF->nChannels; //pWF->nChannels * (pWF->wBitsPerSample + 7) / 8;
pWF->nAvgBytesPerSec = pWF->nBlockAlign * pWF->nSamplesPerSec;
pWF->cbSize = 0;
-
+
memset(&this->m_sOurType, 0, sizeof(this->m_sOurType));
this->m_sOurType.majortype=MEDIATYPE_Audio;
this->m_sOurType.subtype=MEDIASUBTYPE_PCM;
Modified: mplayerxp/loader/dmo/DMO_VideoDecoder.c
===================================================================
--- mplayerxp/loader/dmo/DMO_VideoDecoder.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/loader/dmo/DMO_VideoDecoder.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -99,10 +99,9 @@
DMO_VideoDecoder *this;
HRESULT result;
ct* c;
-
- this = mp_malloc(sizeof(DMO_VideoDecoder));
- memset( this, 0, sizeof(DMO_VideoDecoder));
-
+
+ this = mp_mallocz(sizeof(DMO_VideoDecoder));
+
this->m_sVhdr2 = 0;
this->m_iLastQuality = -1;
this->m_iMaxAuto = maxauto;
Modified: mplayerxp/loader/dmo/dmo.c
===================================================================
--- mplayerxp/loader/dmo/dmo.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/loader/dmo/dmo.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -32,11 +32,10 @@
{
HRESULT hr = 0;
const char* em = NULL;
- DMO_Filter* This = (DMO_Filter*) mp_malloc(sizeof(DMO_Filter));
+ DMO_Filter* This = (DMO_Filter*) mp_mallocz(sizeof(DMO_Filter));
if (!This)
return NULL;
- memset(This, 0, sizeof(DMO_Filter));
#ifdef HAVE_WIN32LOADER
CodecAlloc();
#endif
Modified: mplayerxp/loader/driver.c
===================================================================
--- mplayerxp/loader/driver.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/loader/driver.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -162,10 +162,9 @@
printf("Loading codec DLL: '%s'\n",filename);
#endif
- hDriver = (NPDRVR) mp_malloc(sizeof(DRVR));
+ hDriver = (NPDRVR) mp_mallocz(sizeof(DRVR));
if (!hDriver)
return ((HDRVR) 0);
- memset((any_t*)hDriver, 0, sizeof(DRVR));
#ifdef HAVE_WIN32LOADER
CodecAlloc();
Modified: mplayerxp/loader/dshow/DS_VideoDecoder.c
===================================================================
--- mplayerxp/loader/dshow/DS_VideoDecoder.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/loader/dshow/DS_VideoDecoder.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -96,10 +96,9 @@
DS_VideoDecoder *this;
HRESULT result;
ct* c;
-
- this = mp_malloc(sizeof(DS_VideoDecoder));
- memset( this, 0, sizeof(DS_VideoDecoder));
-
+
+ this = mp_mallocz(sizeof(DS_VideoDecoder));
+
this->m_sVhdr2 = 0;
this->m_iLastQuality = -1;
this->m_iMaxAuto = maxauto;
Modified: mplayerxp/loader/dshow/inputpin.c
===================================================================
--- mplayerxp/loader/dshow/inputpin.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/loader/dshow/inputpin.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -1214,7 +1214,7 @@
This->refcount = 1;
This->pin = (IPin*) CRemotePin2Create(This);
- This->vt = (IBaseFilter_vt*) mp_malloc(sizeof(IBaseFilter_vt));
+ This->vt = (IBaseFilter_vt*) mp_mallocz(sizeof(IBaseFilter_vt));
if (!This->pin || !This->vt)
{
@@ -1222,7 +1222,6 @@
return NULL;
}
- memset(This->vt, 0, sizeof(IBaseFilter_vt));
This->vt->QueryInterface = CBaseFilter2_QueryInterface;
This->vt->AddRef = CBaseFilter2_AddRef;
This->vt->Release = CBaseFilter2_Release;
@@ -1377,7 +1376,7 @@
This->remote_pin = rpin;
This->refcount = 1;
- This->vt = (IPin_vt*) mp_malloc(sizeof(IPin_vt));
+ This->vt = (IPin_vt*) mp_mallocz(sizeof(IPin_vt));
if (!This->vt)
{
@@ -1385,7 +1384,6 @@
return NULL;
}
- memset(This->vt, 0, sizeof(IPin_vt));
This->vt->QueryInterface = CRemotePin_QueryInterface;
This->vt->AddRef = CRemotePin_AddRef;
This->vt->Release = CRemotePin_Release;
@@ -1466,7 +1464,7 @@
This->parent = p;
This->refcount = 1;
- This->vt = (IPin_vt*) mp_malloc(sizeof(IPin_vt));
+ This->vt = (IPin_vt*) mp_mallocz(sizeof(IPin_vt));
if (!This->vt)
{
@@ -1474,7 +1472,6 @@
return NULL;
}
- memset(This->vt, 0, sizeof(IPin_vt));
This->vt->QueryInterface = CRemotePin2_QueryInterface;
This->vt->AddRef = CRemotePin2_AddRef;
This->vt->Release = CRemotePin2_Release;
Modified: mplayerxp/loader/module.c
===================================================================
--- mplayerxp/loader/module.c 2012-10-30 16:47:49 UTC (rev 264)
+++ mplayerxp/loader/module.c 2012-10-30 17:46:02 UTC (rev 265)
@@ -830,8 +830,7 @@
// memory management:
case 0x150011: //NewPtrClear
case 0x150012: //NewPtrSysClear
- reg->eax=(uint32_t)mp_malloc(((uint32_t *)stack_base)[1]);
- memset((any_t*)reg->eax,0,((uint32_t *)stack_base)[1]);
+ reg->eax=(uint32_t)mp_mallocz(((uint32...
[truncated message content] |
