[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[430] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[430] mplayerxp
|
From: <nic...@us...> - 2012-11-22 12:22:22
|
Revision: 430
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=430&view=rev
Author: nickols_k
Date: 2012-11-22 12:22:07 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
replace mp_free() with operator delete
Modified Paths:
--------------
mplayerxp/dump.cpp
mplayerxp/input2/input.cpp
mplayerxp/libao2/ao_alsa9.cpp
mplayerxp/libao2/ao_esd.cpp
mplayerxp/libao2/ao_jack.cpp
mplayerxp/libao2/ao_nas.cpp
mplayerxp/libao2/ao_null.cpp
mplayerxp/libao2/ao_openal.cpp
mplayerxp/libao2/ao_oss.cpp
mplayerxp/libao2/ao_sdl.cpp
mplayerxp/libao2/ao_wav.cpp
mplayerxp/libmpcodecs/ad_a52.cpp
mplayerxp/libmpcodecs/ad_acm.cpp
mplayerxp/libmpcodecs/ad_dca.cpp
mplayerxp/libmpcodecs/ad_dmo.cpp
mplayerxp/libmpcodecs/ad_dshow.cpp
mplayerxp/libmpcodecs/ad_faad.cpp
mplayerxp/libmpcodecs/ad_ffmpeg.cpp
mplayerxp/libmpcodecs/ad_libdv.cpp
mplayerxp/libmpcodecs/ad_mp3.cpp
mplayerxp/libmpcodecs/ad_real.cpp
mplayerxp/libmpcodecs/ad_twin.cpp
mplayerxp/libmpcodecs/ad_vorbis.cpp
mplayerxp/libmpcodecs/libdca/parse.cpp
mplayerxp/libmpcodecs/vd_divx4.cpp
mplayerxp/libmpcodecs/vd_ffmpeg.cpp
mplayerxp/libmpcodecs/vd_huffyuv.cpp
mplayerxp/libmpcodecs/vd_libmpeg2.cpp
mplayerxp/libmpcodecs/vd_real.cpp
mplayerxp/libmpcodecs/vd_theora.cpp
mplayerxp/libmpcodecs/vd_vfw.cpp
mplayerxp/libmpcodecs/vd_xanim.cpp
mplayerxp/libmpconf/codec-cfg.cpp
mplayerxp/libmpconf/m_option.cpp
mplayerxp/libmpconf/m_property.cpp
mplayerxp/libmpconf/m_struct.cpp
mplayerxp/libmpconf/subopt-helper.cpp
mplayerxp/libmpdemux/demux_aiff.cpp
mplayerxp/libmpdemux/demux_asf.cpp
mplayerxp/libmpdemux/demux_audio.cpp
mplayerxp/libmpdemux/demux_avi.cpp
mplayerxp/libmpdemux/demux_bmp.cpp
mplayerxp/libmpdemux/demux_demuxers.cpp
mplayerxp/libmpdemux/demux_dv.cpp
mplayerxp/libmpdemux/demux_film.cpp
mplayerxp/libmpdemux/demux_fli.cpp
mplayerxp/libmpdemux/demux_lavf.cpp
mplayerxp/libmpdemux/demux_mkv.cpp
mplayerxp/libmpdemux/demux_mov.cpp
mplayerxp/libmpdemux/demux_mpg.cpp
mplayerxp/libmpdemux/demux_mpxp64.cpp
mplayerxp/libmpdemux/demux_nsv.cpp
mplayerxp/libmpdemux/demux_nuv.cpp
mplayerxp/libmpdemux/demux_ogg.cpp
mplayerxp/libmpdemux/demux_pva.cpp
mplayerxp/libmpdemux/demux_ra.cpp
mplayerxp/libmpdemux/demux_real.cpp
mplayerxp/libmpdemux/demux_ts.cpp
mplayerxp/libmpdemux/demux_viv.cpp
mplayerxp/libmpdemux/demux_y4m.cpp
mplayerxp/libmpdemux/demuxer.cpp
mplayerxp/libmpdemux/demuxer_r.cpp
mplayerxp/libmpdemux/mpeg_hdr.cpp
mplayerxp/libmpdemux/mux_lavf.cpp
mplayerxp/libmpdemux/mux_mpxp64.cpp
mplayerxp/libmpdemux/muxer.cpp
mplayerxp/libmpdemux/parse_mp4.cpp
mplayerxp/libmpdemux/sub_cc.cpp
mplayerxp/libmpdemux/sub_ty.cpp
mplayerxp/libmpstream/asf_mmst_streaming.cpp
mplayerxp/libmpstream/asf_streaming.cpp
mplayerxp/libmpstream/cache2.cpp
mplayerxp/libmpstream/cdda.cpp
mplayerxp/libmpstream/cddb.cpp
mplayerxp/libmpstream/cookies.cpp
mplayerxp/libmpstream/freesdp/common.cpp
mplayerxp/libmpstream/http.cpp
mplayerxp/libmpstream/librtsp/rtsp_rtp.cpp
mplayerxp/libmpstream/librtsp/rtsp_session.cpp
mplayerxp/libmpstream/mrl.cpp
mplayerxp/libmpstream/network.cpp
mplayerxp/libmpstream/pnm.cpp
mplayerxp/libmpstream/realrtsp/asmrp.cpp
mplayerxp/libmpstream/realrtsp/rmff.cpp
mplayerxp/libmpstream/realrtsp/sdpplin.cpp
mplayerxp/libmpstream/realrtsp/xbuffer.cpp
mplayerxp/libmpstream/s_cdd.cpp
mplayerxp/libmpstream/s_dvdnav.cpp
mplayerxp/libmpstream/s_dvdread.cpp
mplayerxp/libmpstream/s_ffmpeg.cpp
mplayerxp/libmpstream/s_file.cpp
mplayerxp/libmpstream/s_ftp.cpp
mplayerxp/libmpstream/s_network.cpp
mplayerxp/libmpstream/s_oss.cpp
mplayerxp/libmpstream/s_rtsp.cpp
mplayerxp/libmpstream/s_tv.cpp
mplayerxp/libmpstream/s_vcdnav.cpp
mplayerxp/libmpstream/stream.cpp
mplayerxp/libmpstream/tvi/tvi_dummy.cpp
mplayerxp/libmpstream/tvi/tvi_v4l.cpp
mplayerxp/libmpstream/url.cpp
mplayerxp/libmpsub/subreader.cpp
mplayerxp/libmpsub/vobsub.cpp
mplayerxp/libplaytree/asxparser.cpp
mplayerxp/libplaytree/playtree.cpp
mplayerxp/libplaytree/playtreeparser.cpp
mplayerxp/libvo/jpeg_enc.cpp
mplayerxp/libvo/screenshot.cpp
mplayerxp/libvo/sub.cpp
mplayerxp/libvo/vo_dga.cpp
mplayerxp/libvo/vo_fbdev.cpp
mplayerxp/libvo/vo_null.cpp
mplayerxp/libvo/vo_opengl.cpp
mplayerxp/libvo/vo_vesa.cpp
mplayerxp/libvo/vo_xv.cpp
mplayerxp/libvo/x11_common.cpp
mplayerxp/mp_msg.cpp
mplayerxp/mplayerxp.cpp
mplayerxp/osdep/cpudetect.cpp
mplayerxp/postproc/af_ao2.cpp
mplayerxp/postproc/af_channels.cpp
mplayerxp/postproc/af_crystality.cpp
mplayerxp/postproc/af_delay.cpp
mplayerxp/postproc/af_dyn.cpp
mplayerxp/postproc/af_echo3d.cpp
mplayerxp/postproc/af_equalizer.cpp
mplayerxp/postproc/af_extrastereo.cpp
mplayerxp/postproc/af_ffenc.cpp
mplayerxp/postproc/af_lp.cpp
mplayerxp/postproc/af_pan.cpp
mplayerxp/postproc/af_raw.cpp
mplayerxp/postproc/af_resample.cpp
mplayerxp/postproc/af_scaletempo.cpp
mplayerxp/postproc/af_sinesuppress.cpp
mplayerxp/postproc/af_sub.cpp
mplayerxp/postproc/af_surround.cpp
mplayerxp/postproc/af_volnorm.cpp
mplayerxp/postproc/af_volume.cpp
mplayerxp/postproc/libmenu/menu_cmdlist.cpp
mplayerxp/postproc/libmenu/menu_console.cpp
mplayerxp/postproc/libmenu/menu_filesel.cpp
mplayerxp/postproc/libmenu/menu_param.cpp
mplayerxp/postproc/vf_delogo.cpp
mplayerxp/postproc/vf_denoise3d.cpp
mplayerxp/postproc/vf_dint.cpp
mplayerxp/postproc/vf_down3dright.cpp
mplayerxp/postproc/vf_eq.cpp
mplayerxp/postproc/vf_framestep.cpp
mplayerxp/postproc/vf_menu.cpp
mplayerxp/postproc/vf_noise.cpp
mplayerxp/postproc/vf_ow.cpp
mplayerxp/postproc/vf_perspective.cpp
mplayerxp/postproc/vf_raw.cpp
mplayerxp/postproc/vf_scale.cpp
mplayerxp/postproc/vf_smartblur.cpp
mplayerxp/postproc/vf_softpulldown.cpp
mplayerxp/postproc/vf_unsharp.cpp
mplayerxp/postproc/vf_vo.cpp
mplayerxp/postproc/vf_yuvcsp.cpp
mplayerxp/xmpcore/mp_image.cpp
mplayerxp/xmpcore/xmp_adecoder.cpp
mplayerxp/xmpcore/xmp_core.cpp
Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/dump.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -271,7 +271,7 @@
fseeko(priv->mux_file,0,SEEK_SET);
muxer_write_header(priv->muxer,demuxer);
fclose(priv->mux_file);
- mp_free(demuxer->priv);
+ delete demuxer->priv;
demuxer->priv=NULL;
}
MSG_INFO(MSGTR_CoreDumped);
Modified: mplayerxp/input2/input.cpp
===================================================================
--- mplayerxp/input2/input.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/input2/input.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -486,7 +486,7 @@
}
if(i == priv->num_cmd_fd) return;
if(priv->cmd_fds[i].close_func) priv->cmd_fds[i].close_func(priv->cmd_fds[i].opaque);
- if(priv->cmd_fds[i].buffer) mp_free(priv->cmd_fds[i].buffer);
+ if(priv->cmd_fds[i].buffer) delete priv->cmd_fds[i].buffer;
if(i + 1 < priv->num_cmd_fd) memmove(&priv->cmd_fds[i],&priv->cmd_fds[i+1],(priv->num_cmd_fd-i-1)*sizeof(mp_input_fd_t));
priv->num_cmd_fd--;
}
@@ -948,7 +948,7 @@
continue;
}
ret = mp_input_parse_cmd(cmd);
- mp_free(cmd);
+ delete cmd;
if(!ret) continue;
last_loop = i;
return ret;
@@ -1020,9 +1020,9 @@
for(i=0; i < MP_CMD_MAX_ARGS && cmd->args[i].type != -1; i++) {
if(cmd->args[i].type == MP_CMD_ARG_STRING && cmd->args[i].v.s != NULL)
- mp_free(cmd->args[i].v.s);
+ delete cmd->args[i].v.s;
}
- mp_free(cmd);
+ delete cmd;
}
static mp_cmd_t* mp_cmd_clone(mp_cmd_t* cmd) {
@@ -1129,7 +1129,7 @@
int i;
if(!binds) return;
for(i = 0; binds[i].cmd != NULL; i++) delete binds[i].cmd;
- mp_free(binds);
+ delete binds;
}
#define BS_MAX 256
@@ -1339,7 +1339,7 @@
if(priv->cmd_binds[i].cmd != NULL) delete priv->cmd_binds[i].cmd;
else break;
}
- mp_free(priv->cmd_binds);
+ delete priv->cmd_binds;
priv->cmd_binds=NULL;
}
if(priv->in_file_fd==0) getch2_disable();
@@ -1357,7 +1357,7 @@
void mp_input_close(any_t* handle) {
mp_input_uninit(handle);
- mp_free(handle);
+ delete handle;
}
void mp_input_register_options(m_config_t* cfg) {
Modified: mplayerxp/libao2/ao_alsa9.cpp
===================================================================
--- mplayerxp/libao2/ao_alsa9.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libao2/ao_alsa9.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -633,21 +633,21 @@
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
if(!priv->handler) {
MSG_ERR("alsa-uninit: no handler defined!\n");
- mp_free(priv);
+ delete priv;
return;
}
if (!priv_conf.noblock) {
if ((err = snd_pcm_drain(priv->handler)) < 0) {
MSG_ERR("alsa-uninit: pcm drain error: %s\n", snd_strerror(err));
- mp_free(priv);
+ delete priv;
return;
}
}
if ((err = snd_pcm_close(priv->handler)) < 0) {
MSG_ERR("alsa-uninit: pcm close error: %s\n", snd_strerror(err));
- mp_free(priv);
+ delete priv;
return;
} else {
priv->handler = NULL;
@@ -655,7 +655,7 @@
}
snd_pcm_hw_params_free(priv->hwparams);
snd_pcm_sw_params_free(priv->swparams);
- mp_free(priv);
+ delete priv;
}
static void audio_pause(ao_data_t* ao)
@@ -930,7 +930,7 @@
if ((int)result < 0) result = 0;
#ifdef USE_POLL
- mp_free(ufds);
+ delete ufds;
#endif
return result;
Modified: mplayerxp/libao2/ao_esd.cpp
===================================================================
--- mplayerxp/libao2/ao_esd.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libao2/ao_esd.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -315,7 +315,7 @@
esd_close(priv->fd);
priv->fd = -1;
}
- mp_free(priv);
+ delete priv;
}
Modified: mplayerxp/libao2/ao_jack.cpp
===================================================================
--- mplayerxp/libao2/ao_jack.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libao2/ao_jack.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -309,14 +309,14 @@
ao->bps = channels * rate * sizeof(float);
ao->buffersize = CHUNK_SIZE * NUM_CHUNKS;
ao->outburst = CHUNK_SIZE;
- mp_free(matching_ports);
- mp_free(port_name);
+ delete matching_ports;
+ delete port_name;
delete client_name;
return MPXP_Ok;
err_out:
- mp_free(matching_ports);
- mp_free(port_name);
+ delete matching_ports;
+ delete port_name;
delete client_name;
if (priv->client) jack_client_close(priv->client);
av_fifo_free(priv->buffer);
@@ -333,7 +333,7 @@
jack_client_close(priv->client);
av_fifo_free(priv->buffer);
priv->buffer = NULL;
- mp_free(priv);
+ delete priv;
}
/**
Modified: mplayerxp/libao2/ao_nas.cpp
===================================================================
--- mplayerxp/libao2/ao_nas.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libao2/ao_nas.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -528,9 +528,9 @@
pthread_join(priv->event_thread, NULL);
AuCloseServer(priv->aud);
priv->aud = 0;
- mp_free(priv->client_buffer);
- mp_free(priv->server_buffer);
- mp_free(priv);
+ delete priv->client_buffer;
+ delete priv->server_buffer;
+ delete priv;
}
// stop playing and empty buffers (for seeking/pause)
Modified: mplayerxp/libao2/ao_null.cpp
===================================================================
--- mplayerxp/libao2/ao_null.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libao2/ao_null.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -185,7 +185,7 @@
fwrite(&wavhdr,sizeof(wavhdr),1,priv->fd);
}
if(priv->fd) fclose(priv->fd);
- mp_free(priv);
+ delete priv;
}
// stop playing and empty priv->buffers (for seeking/pause)
Modified: mplayerxp/libao2/ao_openal.cpp
===================================================================
--- mplayerxp/libao2/ao_openal.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libao2/ao_openal.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -169,7 +169,7 @@
ALCcontext *ctx = alcGetCurrentContext();
ALCdevice *dev = alcGetContextsDevice(ctx);
priv_t*priv=reinterpret_cast<priv_t*>(ao->priv);
- mp_free(priv->tmpbuf);
+ delete priv->tmpbuf;
if (!immed) {
ALint state;
alGetSourcei(priv->sources[0], AL_SOURCE_STATE, &state);
@@ -182,7 +182,7 @@
alcMakeContextCurrent(NULL);
alcDestroyContext(ctx);
alcCloseDevice(dev);
- mp_free(ao->priv);
+ delete ao->priv;
}
static void unqueue_buffers(const ao_data_t* ao) {
Modified: mplayerxp/libao2/ao_oss.cpp
===================================================================
--- mplayerxp/libao2/ao_oss.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libao2/ao_oss.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -324,7 +324,7 @@
write(priv->fd,data,ao->outburst);
ao->buffersize+=ao->outburst;
}
- mp_free(data);
+ delete data;
if(ao->buffersize==0){
MSG_ERR("\n *** OSS-CONF: Your audio driver DOES NOT support select() ***\n"
"Recompile mplayerxp with #undef HAVE_AUDIO_SELECT in mp_config.h !\n\n");
@@ -351,7 +351,7 @@
#endif
close(priv->fd);
priv->fd = -1;
- mp_free(ao->priv);
+ delete ao->priv;
}
// stop playing and empty buffers (for seeking/pause)
Modified: mplayerxp/libao2/ao_sdl.cpp
===================================================================
--- mplayerxp/libao2/ao_sdl.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libao2/ao_sdl.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -275,7 +275,7 @@
MSG_V("SDL: Audio Subsystem shutting down!\n");
SDL_CloseAudio();
SDL_QuitSubSystem(SDL_INIT_AUDIO);
- mp_free(ao->priv);
+ delete ao->priv;
}
// stop playing and empty buffers (for seeking/pause)
Modified: mplayerxp/libao2/ao_wav.cpp
===================================================================
--- mplayerxp/libao2/ao_wav.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libao2/ao_wav.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -198,8 +198,8 @@
}
fclose(priv->fp);
if (priv->out_filename)
- mp_free(priv->out_filename);
- mp_free(priv);
+ delete priv->out_filename;
+ delete priv;
}
// stop playing and empty buffers (for seeking/pause)
Modified: mplayerxp/libmpcodecs/ad_a52.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_a52.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -204,7 +204,7 @@
void uninit(sh_audio_t *sh)
{
- mp_free(sh->context);
+ delete sh->context;
}
MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
Modified: mplayerxp/libmpcodecs/ad_acm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_acm.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -155,7 +155,7 @@
void uninit(sh_audio_t *sh)
{
close_acm_audio_codec(sh);
- mp_free(sh->context);
+ delete sh->context;
}
MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
Modified: mplayerxp/libmpcodecs/ad_dca.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_dca.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -203,7 +203,7 @@
void uninit(sh_audio_t *sh)
{
- mp_free(sh->context);
+ delete sh->context;
}
MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
Modified: mplayerxp/libmpcodecs/ad_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_dmo.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -49,7 +49,7 @@
sh_audio->context=priv;
if(!(priv->ds_adec=DMO_AudioDecoder_Open(sh_audio->codec->dll_name,&sh_audio->codec->guid,sh_audio->wf,chans))) {
MSG_ERR(MSGTR_MissingDLLcodec,sh_audio->codec->dll_name);
- mp_free(sh_audio->context);
+ delete sh_audio->context;
return MPXP_False;
}
sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
@@ -66,7 +66,7 @@
{
priv_t*priv = reinterpret_cast<priv_t*>(sh->context);
DMO_AudioDecoder_Destroy(priv->ds_adec);
- mp_free(priv);
+ delete priv;
}
static MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
Modified: mplayerxp/libmpcodecs/ad_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_dshow.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -42,7 +42,7 @@
sh_audio->context=priv;
if(!(priv->ds_adec=DS_AudioDecoder_Open(sh_audio->codec->dll_name,&sh_audio->codec->guid,sh_audio->wf))) {
MSG_ERR(MSGTR_MissingDLLcodec,sh_audio->codec->dll_name);
- mp_free(sh_audio->context);
+ delete sh_audio->context;
return MPXP_False;
}
sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
@@ -59,7 +59,7 @@
{
priv_t* priv = reinterpret_cast<priv_t*>(sh->context);
DS_AudioDecoder_Destroy(priv->ds_adec);
- mp_free(priv);
+ delete priv;
}
MPXP_Rc control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
Modified: mplayerxp/libmpcodecs/ad_faad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_faad.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -273,7 +273,7 @@
{
MSG_V("FAAD: Closing decoder!\n");
NeAACDecClose(NeAAC_hdec);
- mp_free(sh->context);
+ delete sh->context;
}
static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
Modified: mplayerxp/libmpcodecs/ad_ffmpeg.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmpeg.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_ffmpeg.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -172,10 +172,10 @@
{
priv_t* priv=reinterpret_cast<priv_t*>(sh->context);
avcodec_close(priv->lavc_ctx);
- if (priv->lavc_ctx->extradata) mp_free(priv->lavc_ctx->extradata);
- mp_free(priv->lavc_ctx);
+ if (priv->lavc_ctx->extradata) delete priv->lavc_ctx->extradata;
+ delete priv->lavc_ctx;
if(priv->probe) { delete priv->probe->codec_dll; delete priv->probe; }
- mp_free(priv);
+ delete priv;
sh->context=NULL;
}
Modified: mplayerxp/libmpcodecs/ad_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_libdv.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -87,7 +87,7 @@
unsigned i;
UNUSED(sh_audio);
for (i=0; i < 4; i++)
- mp_free(priv->audioBuffers[i]);
+ delete priv->audioBuffers[i];
}
static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
Modified: mplayerxp/libmpcodecs/ad_mp3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_mp3.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -312,7 +312,7 @@
mpg123_close(priv->mh);
mpg123_delete(priv->mh);
mpg123_exit();
- mp_free(priv);
+ delete priv;
return MPXP_False;
}
mpg123_getformat(priv->mh, &rate, &nch, &enc);
@@ -349,7 +349,7 @@
mpg123_close(priv->mh);
mpg123_delete(priv->mh);
mpg123_exit();
- mp_free(priv);
+ delete priv;
dlclose(dll_handle);
}
Modified: mplayerxp/libmpcodecs/ad_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_real.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_real.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -52,7 +52,7 @@
/* required for cook's uninit: */
void __builtin_delete(any_t* ize) {
- mp_free(ize);
+ delete ize;
}
#if defined(__FreeBSD__) || defined(__NetBSD__)
@@ -99,7 +99,7 @@
priv_t *priv;
sh->context=priv=new(zeromem) priv_t;
if(!(handle = dlopen (sh->codec->dll_name, RTLD_LAZY))) {
- mp_free(sh->context);
+ delete sh->context;
return MPXP_False;
}
@@ -117,7 +117,7 @@
if(!raCloseCodec || !raDecode || !raFreeDecoder ||
!raGetFlavorProperty || !(raOpenCodec2||raOpenCodec) || !raSetFlavor ||
!raInitDecoder){
- mp_free(sh->context);
+ delete sh->context;
return MPXP_False;
}
@@ -134,7 +134,7 @@
path[strlen(path)+1]=0;
if(raSetDLLAccessPath)
- raSetDLLAccessPath(uint32_t(path));
+ raSetDLLAccessPath(long(path));
if(raOpenCodec2) {
strcat(cpath,"/");
@@ -143,7 +143,7 @@
else result=raOpenCodec(&priv->internal);
if(result){
MSG_WARN("Decoder open failed, error code: 0x%X\n",result);
- mp_free(sh->context);
+ delete sh->context;
return MPXP_False;
}
@@ -164,7 +164,7 @@
result=raInitDecoder(priv->internal,&init_data);
if(result){
MSG_WARN("Decoder init failed, error code: 0x%X\n",result);
- mp_free(sh->context);
+ delete sh->context;
return MPXP_False;
}
@@ -176,7 +176,7 @@
result=raSetFlavor(priv->internal,((short*)(sh->wf+1))[2]);
if(result){
MSG_WARN("Decoder flavor setup failed, error code: 0x%X\n",result);
- mp_free(sh->context);
+ delete sh->context;
return MPXP_False;
}
@@ -208,9 +208,9 @@
static void uninit(sh_audio_t *sh){
// uninit the decoder etc...
priv_t *priv = reinterpret_cast<priv_t*>(sh->context);
- if (raFreeDecoder) raFreeDecoder(uint32_t(priv->internal));
- if (raCloseCodec) raCloseCodec(uint32_t(priv->internal));
- mp_free(sh->context);
+ if (raFreeDecoder) raFreeDecoder(long(priv->internal));
+ if (raCloseCodec) raCloseCodec(long(priv->internal));
+ delete sh->context;
}
static const unsigned char sipr_swaps[38][2]={
Modified: mplayerxp/libmpcodecs/ad_twin.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_twin.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -332,7 +332,7 @@
void uninit(sh_audio_t *sh)
{
close_vqf_audio_codec(sh);
- mp_free(sh->context);
+ delete sh->context;
FreeLibrary(vqf_dll);
}
Modified: mplayerxp/libmpcodecs/ad_vorbis.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -74,7 +74,7 @@
/// Header
if(vorbis_synthesis_headerin(&priv->vi,&vc,&op) <0) {
MSG_ERR("OggVorbis: initial (identification) header broken!\n");
- mp_free(priv);
+ delete priv;
return MPXP_False;
}
op.bytes = ds_get_packet_r(sh->ds,&op.packet,&pts);
@@ -82,14 +82,14 @@
/// Comments
if(vorbis_synthesis_headerin(&priv->vi,&vc,&op) <0) {
MSG_ERR("OggVorbis: comment header broken!\n");
- mp_free(priv);
+ delete priv;
return MPXP_False;
}
op.bytes = ds_get_packet_r(sh->ds,&op.packet,&pts);
//// Codebook
if(vorbis_synthesis_headerin(&priv->vi,&vc,&op)<0) {
MSG_WARN("OggVorbis: codebook header broken!\n");
- mp_free(priv);
+ delete priv;
return MPXP_False;
} else { /// Print the infos
char **ptr=vc.user_comments;
@@ -131,7 +131,7 @@
static void uninit(sh_audio_t *sh)
{
- mp_free(sh->context);
+ delete sh->context;
}
static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...)
Modified: mplayerxp/libmpcodecs/libdca/parse.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/parse.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/libdca/parse.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -85,7 +85,7 @@
state->samples = (sample_t *) mp_memalign (16, 256 * 12 * sizeof (sample_t));
if (state->samples == NULL) {
- mp_free (state);
+ delete state;
return NULL;
}
@@ -1294,6 +1294,6 @@
void dca_free (dca_state_t * state)
{
- mp_free (state->samples);
- mp_free (state);
+ delete state->samples;
+ delete state;
}
Modified: mplayerxp/libmpcodecs/vd_divx4.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/vd_divx4.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -252,7 +252,7 @@
priv_t*p=reinterpret_cast<priv_t*>(sh->context);
p->decoder(p->pHandle, DEC_OPT_RELEASE, 0, 0);
dlclose(dll_handle);
- mp_free(p);
+ delete p;
}
// decode a frame
Modified: mplayerxp/libmpcodecs/vd_ffmpeg.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_ffmpeg.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/vd_ffmpeg.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -434,11 +434,11 @@
if (avcodec_close(priv->ctx) < 0)
MSG_ERR( MSGTR_CantCloseCodec);
if (priv->ctx->extradata_size)
- mp_free(priv->ctx->extradata);
- mp_free(priv->ctx);
- mp_free(priv->lavc_picture);
+ delete priv->ctx->extradata;
+ delete priv->ctx;
+ delete priv->lavc_picture;
if(priv->probe) { delete priv->probe->codec_dll; delete priv->probe; }
- mp_free(priv);
+ delete priv;
if(ppContext) pp_free_context(ppContext);
ppContext=NULL;
pp2_uninit();
@@ -549,7 +549,7 @@
}
if(mpi) {
- if(mpi->bpp == 8 && mpi->planes[1]) mp_free(mpi->planes[1]);
+ if(mpi->bpp == 8 && mpi->planes[1]) delete mpi->planes[1];
if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) free_mp_image(mpi);
}
Modified: mplayerxp/libmpcodecs/vd_huffyuv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/vd_huffyuv.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -349,10 +349,10 @@
{
if (sh->context) {
if (((priv_t*)&sh->context)->abovebuf1)
- mp_free(((priv_t*)sh->context)->abovebuf1);
+ delete ((priv_t*)sh->context)->abovebuf1;
if (((priv_t*)&sh->context)->abovebuf2)
- mp_free(((priv_t*)sh->context)->abovebuf2);
- mp_free(sh->context);
+ delete ((priv_t*)sh->context)->abovebuf2;
+ delete sh->context;
}
}
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -268,7 +268,7 @@
static void uninit(sh_video_t *sh){
priv_t *priv=reinterpret_cast<priv_t*>(sh->context);
mpeg2_close(priv->mpeg2dec);
- mp_free(priv);
+ delete priv;
dlclose(dll_handle);
}
Modified: mplayerxp/libmpcodecs/vd_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_real.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/vd_real.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -84,7 +84,7 @@
}
void __builtin_vec_delete(any_t*mem) {
- mp_free(mem);
+ delete mem;
}
void __pure_virtual(void)
Modified: mplayerxp/libmpcodecs/vd_theora.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/vd_theora.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -113,7 +113,7 @@
if (failed) {
if (priv) {
- mp_free (priv);
+ delete priv;
sh->context = NULL;
}
return MPXP_False;
@@ -137,7 +137,7 @@
priv_t *priv = (priv_t *)sh->context;
if (priv) {
theora_clear (&priv->st);
- mp_free (priv);
+ delete priv;
}
}
Modified: mplayerxp/libmpcodecs/vd_vfw.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/vd_vfw.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -266,8 +266,8 @@
{
priv_t *priv=reinterpret_cast<priv_t*>(sh->context);
vfw_close_video_codec(sh);
- mp_free(priv->o_bih);
- mp_free(sh->context);
+ delete priv->o_bih;
+ delete sh->context;
}
// decode a frame
Modified: mplayerxp/libmpcodecs/vd_xanim.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpcodecs/vd_xanim.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -446,7 +446,7 @@
if (xacodec_query(xacodec_driver, &codec_hdr) == 0)
return(0);
-// mp_free(codec_hdr.anim_hdr);
+// delete codec_hdr.anim_hdr;
xacodec_driver->decinfo = new(zeromem) XA_DEC_INFO;
if (xacodec_driver->decinfo == NULL) {
@@ -584,8 +584,8 @@
}
dlclose(xacodec_driver->file_handler);
if (xacodec_driver->decinfo != NULL)
- mp_free(xacodec_driver->decinfo);
- mp_free(xacodec_driver);
+ delete xacodec_driver->decinfo;
+ delete xacodec_driver;
return(TRUE);
}
Modified: mplayerxp/libmpconf/codec-cfg.cpp
===================================================================
--- mplayerxp/libmpconf/codec-cfg.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpconf/codec-cfg.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -276,7 +276,7 @@
if (i < strlen(tmp_name)) {
MSG_ERR("\ncodec(%s) name is not valid!\n", c->codec_name);
- mp_free(tmp_name);
+ delete tmp_name;
return 0;
}
@@ -284,7 +284,7 @@
strncpy(c->s_info,c->codec_name,sizeof(c->s_info));
c->s_info[sizeof(c->s_info)-1]=0;
}
- mp_free(tmp_name);
+ delete tmp_name;
return 1;
}
@@ -388,8 +388,8 @@
static int nr_acodecs = 0;
void free_codec_cfg(void) {
- if(video_codecs) mp_free(video_codecs);
- if(audio_codecs) mp_free(audio_codecs);
+ if(video_codecs) delete video_codecs;
+ if(audio_codecs) delete audio_codecs;
}
int parse_codec_cfg(const char *cfgfile)
@@ -403,10 +403,10 @@
int tmp, i;
// in case we call it secont time
- if(video_codecs!=NULL)mp_free(video_codecs);
+ if(video_codecs!=NULL)delete video_codecs;
else video_codecs=NULL;
- if(audio_codecs!=NULL)mp_free(audio_codecs);
+ if(audio_codecs!=NULL)delete audio_codecs;
else audio_codecs=NULL;
nr_vcodecs = 0;
@@ -617,7 +617,7 @@
if(video_codecs) video_codecs[nr_vcodecs].codec_name[0] = '\0';
if(audio_codecs) audio_codecs[nr_acodecs].codec_name[0] = '\0';
out:
- mp_free(line);
+ delete line;
line=NULL;
fclose(fp);
return 1;
@@ -629,13 +629,13 @@
PRINT_LINENUM;
err_out:
if (audio_codecs)
- mp_free(audio_codecs);
+ delete audio_codecs;
if (video_codecs)
- mp_free(video_codecs);
+ delete video_codecs;
video_codecs=NULL;
audio_codecs=NULL;
- mp_free(line);
+ delete line;
line=NULL;
fclose(fp);
return 0;
Modified: mplayerxp/libmpconf/m_option.cpp
===================================================================
--- mplayerxp/libmpconf/m_option.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpconf/m_option.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -366,7 +366,7 @@
if(dst) {
if(VAL(dst))
- mp_free(VAL(dst));
+ delete VAL(dst);
VAL(dst) = mp_strdup(param);
}
@@ -384,7 +384,7 @@
UNUSED(opt);
if(dst && src) {
#ifndef NO_FREE
- if(VAL(dst)) mp_free(VAL(dst)); //FIXME!!!
+ if(VAL(dst)) delete VAL(dst); //FIXME!!!
#endif
VAL(dst) = VAL(src) ? mp_strdup(VAL(src)) : NULL;
}
@@ -393,7 +393,7 @@
static void free_str(any_t* src) {
if(src && VAL(src)){
#ifndef NO_FREE
- mp_free(VAL(src)); //FIXME!!!
+ delete VAL(src); //FIXME!!!
#endif
VAL(src) = NULL;
}
@@ -434,8 +434,8 @@
// FIXME!!!
#ifndef NO_FREE
for(i = 0 ; d[i] != NULL ; i++)
- mp_free(d[i]);
- mp_free(d);
+ delete d[i];
+ delete d;
#endif
VAL(dst) = NULL;
}
@@ -458,7 +458,7 @@
} else
memcpy(&lst[ln],add,(n+1)*sizeof(char*));
- mp_free(add);
+ delete add;
VAL(dst) = lst;
@@ -481,23 +481,23 @@
idx = strtol(del[i], &ep, 0);
if(*ep) {
MSG_ERR("Invalid index: %s\n",del[i]);
- mp_free(del[i]);
+ delete del[i];
continue;
}
- mp_free(del[i]);
+ delete del[i];
if(idx < 0 || idx >= ln) {
MSG_ERR("Index %ld is out of range.\n",idx);
continue;
} else if(!lst[idx])
continue;
- mp_free(lst[idx]);
+ delete lst[idx];
lst[idx] = NULL;
s--;
}
- mp_free(del);
+ delete del;
if(s == 0) {
- if(lst) mp_free(lst);
+ if(lst) delete lst;
VAL(dst) = NULL;
return 1;
}
@@ -510,7 +510,7 @@
}
d[s] = NULL;
- if(lst) mp_free(lst);
+ if(lst) delete lst;
VAL(dst) = d;
return 1;
@@ -599,7 +599,7 @@
n++;
}
res[n] = NULL;
- mp_free(str);
+ delete str;
switch(op) {
case OP_ADD:
@@ -654,12 +654,12 @@
for(i = 0 ; lst[i] ; i++) {
if(last) {
ret = dup_printf("%s,%s",last,lst[i]);
- mp_free(last);
+ delete last;
} else
ret = mp_strdup(lst[i]);
last = ret;
}
- if(last && last != ret) mp_free(last);
+ if(last && last != ret) delete last;
return ret;
}
@@ -844,8 +844,8 @@
}
}
- mp_free(subparam);
- mp_free(subopt);
+ delete subparam;
+ delete subopt;
if(dst)
VAL(dst) = lst;
@@ -1354,12 +1354,12 @@
// We need the object desc
if(!p) {
- mp_free(cpy);
+ delete cpy;
return M_OPT_INVALID;
}
desc = p->desc;
r = get_obj_params(name,desc->name,cpy,desc,p->separator,dst ? &opts : NULL);
- mp_free(cpy);
+ delete cpy;
if(r < 0)
return r;
if(!dst)
@@ -1607,7 +1607,7 @@
if(!ptr) {
r = parse_obj_settings(name,last_ptr,mobjl,dst ? &res : NULL,n);
if(r < 0) {
- mp_free(str);
+ delete str;
return r;
}
n++;
@@ -1616,13 +1616,13 @@
ptr[0] = '\0';
r = parse_obj_settings(name,last_ptr,mobjl,dst ? &res : NULL,n);
if(r < 0) {
- mp_free(str);
+ delete str;
return r;
}
ptr++;
n++;
}
- mp_free(str);
+ delete str;
if(n == 0)
return M_OPT_INVALID;
@@ -1638,7 +1638,7 @@
res = (m_obj_settings_t*)mp_realloc(res,(qsize+n+1)*sizeof(m_obj_settings_t));
memcpy(&res[n],queue,(qsize+1)*sizeof(m_obj_settings_t));
n += qsize;
- mp_free(queue);
+ delete queue;
}
if(head) {
int hsize;
@@ -1646,7 +1646,7 @@
/* NOP */;
head = (m_obj_settings_t*)mp_realloc(head,(hsize+n+1)*sizeof(m_obj_settings_t));
memcpy(&head[hsize],res,(n+1)*sizeof(m_obj_settings_t));
- mp_free(res);
+ delete res;
res = head;
}
VAL(dst) = res;
@@ -1666,7 +1666,7 @@
delete d[n].name;
free_str_list(&(d[n].attribs));
}
- mp_free(d);
+ delete d;
#endif
VAL(dst) = NULL;
}
@@ -1967,7 +1967,7 @@
}
r = m_struct_set(desc,dst,"filename",fname);
if(fname != ptr2+1)
- mp_free(fname);
+ delete fname;
if(r < 0) {
MSG_ERR("Option %s: Error while setting filename.\n",name);
return r;
Modified: mplayerxp/libmpconf/m_property.cpp
===================================================================
--- mplayerxp/libmpconf/m_property.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpconf/m_property.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -69,12 +69,12 @@
return r;
val = mp_calloc(1,opt->type->size);
if((r = do_action(prop_list,name,M_PROPERTY_GET,val,ctx)) <= 0) {
- mp_free(val);
+ delete val;
return r;
}
if(!arg) return M_PROPERTY_ERROR;
str = m_option_print(opt,val);
- mp_free(val);
+ delete val;
*(char**)arg = str == (char*)-1 ? NULL : str;
return str != (char*)-1;
case M_PROPERTY_PARSE:
@@ -88,12 +88,12 @@
if(!arg) return M_PROPERTY_ERROR;
val = mp_calloc(1,opt->type->size);
if((r = m_option_parse(opt,opt->name,(char *)arg,val,M_CONFIG_FILE)) <= 0) {
- mp_free(val);
+ delete val;
return r;
}
r = do_action(prop_list,name,M_PROPERTY_SET,val,ctx);
m_option_free(opt,val);
- mp_free(val);
+ delete val;
return r;
}
return do_action(prop_list,name,action,arg,ctx);
Modified: mplayerxp/libmpconf/m_struct.cpp
===================================================================
--- mplayerxp/libmpconf/m_struct.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpconf/m_struct.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -99,7 +99,7 @@
for(i = 0 ; st->fields[i].name ; i++)
m_option_free(&st->fields[i],M_ST_MB_P(obj,st->fields[i].p));
- mp_free(obj);
+ delete obj;
}
any_t*
Modified: mplayerxp/libmpconf/subopt-helper.cpp
===================================================================
--- mplayerxp/libmpconf/subopt-helper.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpconf/subopt-helper.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -150,7 +150,7 @@
tmp.len = 0;
last = parse_str( &str[parse_pos], &tmp );
if (*valp)
- mp_free(*valp);
+ delete *valp;
*valp = NULL;
if (tmp.str && tmp.len > 0) {
*valp = new char [tmp.len + 1];
Modified: mplayerxp/libmpdemux/demux_aiff.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_aiff.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -213,7 +213,7 @@
static void aiff_close(demuxer_t* demuxer)
{
- mp_free(demuxer->priv);
+ delete demuxer->priv;
}
static MPXP_Rc aiff_control(const demuxer_t *demuxer,int cmd,any_t*args)
Modified: mplayerxp/libmpdemux/demux_asf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_asf.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_asf.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -130,17 +130,17 @@
le2me_ASF_header_t(&apriv->asfh); // swap to machine endian
if(memcmp(asf2hdrguid,apriv->asfh.objh.guid,16)==0){
MSG_ERR("ASF_check: found ASF v2 guid!\nCurrently is not supported - please report!\n");
- mp_free(demuxer->priv);
+ delete demuxer->priv;
return MPXP_False; // not ASF guid
}
if(memcmp(asfhdrguid,apriv->asfh.objh.guid,16)){
MSG_V("ASF_check: not ASF guid!\n");
- mp_free(demuxer->priv);
+ delete demuxer->priv;
return MPXP_False; // not ASF guid
}
if(apriv->asfh.cno>256){
MSG_V("ASF_check: invalid subchunks_no %d\n",(int) apriv->asfh.cno);
- mp_free(demuxer->priv);
+ delete demuxer->priv;
return MPXP_False; // invalid header???
}
demuxer->file_format=DEMUXER_TYPE_ASF;
@@ -275,7 +275,7 @@
demux_info_add(demuxer, INFOT_RATING, string);
}
MSG_V("\n");
- mp_free(string);
+ delete string;
break;
}
case ASF_GUID_PREFIX_stream_group: {
@@ -287,7 +287,7 @@
object = (char*)mp_malloc(apriv->objh.size);
if( object==NULL ) {
MSG_ERR("Memory allocation failed\n");
- mp_free(demuxer->priv);
+ delete demuxer->priv;
return NULL;
}
stream_read( demuxer->stream, object, apriv->objh.size );
@@ -310,7 +310,7 @@
streams[2*i+1] = max_bitrate;
}
MSG_V("============ ASF Stream group == END ===\n");
- mp_free( object );
+ delete object ;
break;
}
} // switch GUID
@@ -341,7 +341,7 @@
best_audio = id;
}
}
- mp_free(streams);
+ delete streams;
}
MSG_V("ASF: %d audio and %d video streams found\n",audio_streams,video_streams);
@@ -350,7 +350,7 @@
if(!video_streams){
if(!audio_streams){
MSG_ERR("ASF: no audio or video headers found - broken file?\n");
- mp_free(demuxer->priv);
+ delete demuxer->priv;
return NULL;
}
demuxer->video->id=-2; // audio-only
@@ -407,7 +407,7 @@
s2+=apriv->asf_scrambling_h*apriv->asf_scrambling_w*apriv->asf_scrambling_b;
}
memcpy(src,dst,i);
- mp_free(dst);
+ delete dst;
}
@@ -710,7 +710,7 @@
static void asf_close(demuxer_t *demuxer)
{
- mp_free(demuxer->priv);
+ delete demuxer->priv;
}
static MPXP_Rc asf_control(const demuxer_t *demuxer,int cmd,any_t*args)
Modified: mplayerxp/libmpdemux/demux_audio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_audio.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_audio.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -1770,7 +1770,7 @@
if(!priv)
return;
- mp_free(priv);
+ delete priv;
}
static MPXP_Rc audio_control(const demuxer_t *demuxer,int cmd,any_t*args)
Modified: mplayerxp/libmpdemux/demux_avi.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_avi.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_avi.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -394,7 +394,7 @@
sh_video->aspect = GET_AVI_ASPECT(vprp->dwFrameAspectRatio);
}
if(mp_conf.verbose>=1) print_vprp(vprp);
- mp_free(vprp);
+ delete vprp;
break;
}
case mmioFOURCC('d', 'm', 'l', 'h'): {
@@ -497,7 +497,7 @@
AVIINDEXENTRY *idx;
- if (priv->idx_size) mp_free(priv->idx);
+ if (priv->idx_size) delete priv->idx;
priv->idx_size = 0;
priv->idx_offset = 0;
priv->idx = NULL;
@@ -606,11 +606,11 @@
cx = &priv->suidx[0];
do {
for (j=0;j<cx->nEntriesInUse;j++)
- if (cx->stdidx[j].nEntriesInUse) mp_free(cx->stdidx[j].aIndex);
- mp_free(cx->stdidx);
+ if (cx->stdidx[j].nEntriesInUse) delete cx->stdidx[j].aIndex;
+ delete cx->stdidx;
} while (cx++ != &priv->suidx[priv->suidx_size-1]);
- mp_free(priv->suidx);
+ delete priv->suidx;
}
/* Read a saved index file */
@@ -643,7 +643,7 @@
fread(idx, sizeof(AVIINDEXENTRY), 1, fp);
if (feof(fp)) {
MSG_ERR(MSGTR_MPDEMUX_AVIHDR_PrematureEOF, index_file_load);
- mp_free(priv->idx);
+ delete priv->idx;
priv->idx_size = 0;
goto gen_index;
}
@@ -1533,8 +1533,8 @@
if(!priv) return;
- if(priv->idx_size > 0) mp_free(priv->idx);
- mp_free(priv);
+ if(priv->idx_size > 0) delete priv->idx;
+ delete priv;
}
static MPXP_Rc avi_control(const demuxer_t *demuxer,int cmd,any_t*args)
Modified: mplayerxp/libmpdemux/demux_bmp.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_bmp.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -293,7 +293,7 @@
if(!bmp_image)
return;
- mp_free(bmp_image);
+ delete bmp_image;
}
#endif
Modified: mplayerxp/libmpdemux/demux_demuxers.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_demuxers.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_demuxers.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -94,7 +94,7 @@
if(priv->sd && priv->sd != priv->vd && priv->sd != priv->ad)
FREE_DEMUXER(priv->sd);
- mp_free(priv);
+ delete priv;
demux_info_free(demuxer);
- mp_free(demuxer);
+ delete demuxer;
}
Modified: mplayerxp/libmpdemux/demux_dv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_dv.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_dv.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -230,7 +230,7 @@
if(frames==0)
return;
- mp_free(frames);
+ delete frames;
}
static MPXP_Rc dv_control(const demuxer_t *demuxer,int cmd, any_t*arg) {
Modified: mplayerxp/libmpdemux/demux_film.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_film.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_film.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -226,7 +226,7 @@
if (chunk_type != CHUNK_FILM)
{
MSG_ERR( "Not a FILM file\n");
- mp_free(film_data);
+ delete film_data;
return NULL;
}
@@ -431,8 +431,8 @@
if(!film_data)
return;
if(film_data->chunks)
- mp_free(film_data->chunks);
- mp_free(film_data);
+ delete film_data->chunks;
+ delete film_data;
}
Modified: mplayerxp/libmpdemux/demux_fli.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_fli.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_fli.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -100,8 +100,8 @@
{
MSG_ERR("Bad/unknown magic number (%04x)\n",
magic_number);
- mp_free(header);
- mp_free(frames);
+ delete header;
+ delete frames;
return(NULL);
}
@@ -184,11 +184,11 @@
return;
if(frames->filepos)
- mp_free(frames->filepos);
+ delete frames->filepos;
if(frames->frame_size)
- mp_free(frames->frame_size);
+ delete frames->frame_size;
- mp_free(frames);
+ delete frames;
}
static MPXP_Rc fli_control(const demuxer_t *demuxer,int cmd,any_t*args)
Modified: mplayerxp/libmpdemux/demux_lavf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_lavf.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -181,7 +181,7 @@
else av_log_set_level(AV_LOG_INFO);
if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE) {
- mp_free(demuxer->priv);
+ delete demuxer->priv;
return MPXP_False;
}
avpd.filename= "xxx";
@@ -204,7 +204,7 @@
priv->avif= av_probe_input_format(&avpd, 1);
if(!priv->avif){
MSG_V("LAVF_check: file format not recognized!\n");
- mp_free(demuxer->priv);
+ delete demuxer->priv;
return MPXP_False;
}else
MSG_V("LAVF_check: %s\n", priv->avif->long_name);
@@ -489,7 +489,7 @@
avformat_close_input(&priv->avfc);
}
av_freep(&priv->pb);
- mp_free(priv); demuxer->priv= NULL;
+ delete priv; demuxer->priv= NULL;
}
}
Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_mkv.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -321,7 +321,7 @@
str = (char *) mp_malloc (len+1);
if (stream_read(s, str, len) != (int) len)
{
- mp_free (str);
+ delete str;
return NULL;
}
str[len] = '\0';
@@ -853,7 +853,7 @@
track = mkv_d->tracks[k];
for (i = 0; i < track->num_cached_dps; i++)
free_demux_packet (track->cached_dps[i]);
- mp_free(track->cached_dps);
+ delete track->cached_dps;
track->cached_dps = NULL;
track->num_cached_dps = 0;
track->num_allocated_dps = 0;
@@ -912,7 +912,7 @@
}
while (!last && (*start != 0));
- mp_free(buf);
+ delete buf;
return (things_found & 3) == 3;
}
@@ -962,7 +962,7 @@
if (result != Z_OK && result != Z_STREAM_END)
{
MSG_WARN("[mkv] zlib decompression failed.\n");
- mp_free(*dest);
+ delete *dest;
*dest = NULL;
inflateEnd (&zstream);
return modified;
@@ -993,7 +993,7 @@
{
lzo_fail:
MSG_WARN("[mkv] zlib decompression failed.\n");
- mp_free(*dest);
+ delete *dest;
*dest = NULL;
return modified;
}
@@ -1064,8 +1064,8 @@
demux_mkv_free_encodings(mkv_content_encoding_t *encodings, int numencodings)
{
while (numencodings-- > 0)
- mp_free(encodings[numencodings].comp_settings);
- mp_free(encodings);
+ delete encodings[numencodings].comp_settings;
+ delete encodings;
}
static int
@@ -1364,23 +1364,23 @@
static void
demux_mkv_free_trackentry(mkv_track_t *track) {
if (track->name)
- mp_free (track->name);
+ delete track->name;
if (track->codec_id)
- mp_free (track->codec_id);
+ delete track->codec_id;
if (track->language)
- mp_free (track->language);
+ delete track->language;
if (track->private_data)
- mp_free (track->private_data);
+ delete track->private_data;
if (track->audio_buf)
- mp_free (track->audio_buf);
+ delete track->audio_buf;
if (track->audio_timestamp)
- mp_free (track->audio_timestamp);
+ delete track->audio_timestamp;
#ifdef USE_ASS
if (track->sh_sub && track->sh_sub->ass_track)
ass_free_track (track->sh_sub->ass_track);
#endif
demux_mkv_free_encodings(track->encodings, track->num_encodings);
- mp_free(track);
+ delete track;
}
static int
@@ -1507,7 +1507,7 @@
}
case MATROSKA_ID_TRACKLANGUAGE:
- mp_free(track->language);
+ delete track->language;
track->language = ebml_read_utf8 (s, &l);
if (track->language == NULL)
goto err_out;
@@ -1827,7 +1827,7 @@
(int) ((end / 1000) % 60),
(int) (end % 1000), name);
- mp_free(name);
+ delete name;
break;
}
@@ -1924,11 +1924,11 @@
int x;
uint64_t num = ebml_read_length (s, &x);
l = x + num;
- mp_free(data);
+ delete data;
data = new char [num];
if (stream_read(s, data, num) != (int) num)
{
- mp_free(data);
+ delete data;
return 0;
}
data_size = num;
@@ -2291,7 +2291,7 @@
if (!vi->id) {
MSG_WARN( "[mkv] Unknown/unsupported CodecID (%s) or missing/bad CodecPrivate\n[mkv] data (track %u).\n",
track->codec_id, track->tnum);
- mp_free(bih);
+ delete bih;
return 1;
}
}
@@ -2451,7 +2451,7 @@
else if ((track->a_formattag == 0x2000) || /* AC3 */
(track->a_formattag == 0x2001)) /* DTS */
{
- mp_free(sh_a->wf);
+ delete sh_a->wf;
sh_a->wf = NULL;
}
else if (track->a_formattag == 0x0001) /* PCM || PCM_BE */
@@ -2604,7 +2604,7 @@
{
unsigned char *ptr;
int size;
- mp_free(sh_a->wf);
+ delete sh_a->wf;
sh_a->wf = NULL;
if (track->a_formattag == mmioFOURCC('f', 'L', 'a', 'C'))
@@ -2675,13 +2675,13 @@
m = demux_mkv_decode (track,reinterpret_cast<uint8_t*>(track->private_data),&buffer,&size,2);
if (buffer && m)
{
- mp_free (track->private_data);
+ delete track->private_data;
track->private_data = buffer;
track->private_size = size;
}
if (!demux_mkv_parse_idx (track))
{
- mp_free (track->private_data);
+ delete track->private_data;
track->private_data = NULL;
track->private_size = 0;
}
@@ -2719,7 +2719,7 @@
m = demux_mkv_decode (track,track->private_data,&buffer,&size,2);
if (buffer && m)
{
- mp_free (track->private_data);
+ delete track->private_data;
track->private_data = buffer;
track->private_size = size;
}
@@ -2785,7 +2785,7 @@
MSG_DBG2( "[mkv] no head found\n");
return MPXP_False;
}
- mp_free (str);
+ delete str;
return MPXP_Ok;
}
@@ -2803,7 +2803,7 @@
MSG_DBG2( "[mkv] no head found\n");
return 0;
}
- mp_free (str);
+ delete str;
MSG_V( "[mkv] Found the head...\n");
@@ -3069,28 +3069,28 @@
{
for (i=0; i<mkv_d->num_tracks; i++)
demux_mkv_free_trackentry(mkv_d->tracks[i]);
- mp_free (mkv_d->tracks);
+ delete mkv_d->tracks;
}
if (mkv_d->indexes)
- mp_free (mkv_d->indexes);
+ delete mkv_d->indexes;
if (mkv_d->cluster_positions)
- mp_free (mkv_d->cluster_positions);
+ delete mkv_d->cluster_positions;
if (mkv_d->parsed_cues)
- mp_free (mkv_d->parsed_cues);
+ delete mkv_d->parsed_cues;
if (mkv_d->parsed_seekhead)
- mp_free (mkv_d->parsed_seekhead);
+ delete mkv_d->parsed_seekhead;
if (mkv_d->attachments) {
for (i = 0; i < mkv_d->num_attachments; ++i) {
if (mkv_d->attachments[i].name)
- mp_free (mkv_d->attachments[i].name);
+ delete mkv_d->attachments[i].name;
if (mkv_d->attachments[i].mime)
- mp_free (mkv_d->attachments[i].mime);
+ delete mkv_d->attachments[i].mime;
if (mkv_d->attachments[i].data)
- mp_free (mkv_d->attachments[i].data);
+ delete mkv_d->attachments[i].data;
}
- mp_free (mkv_d->attachments);
+ delete mkv_d->attachments;
}
- mp_free (mkv_d);
+ delete mkv_d;
}
}
@@ -3150,7 +3150,7 @@
int l;
uint64_t num = ebml_read_vlen_uint (buffer, &l);
if (num == EBML_UINT_INVALID) {
- mp_free(lace_size);
+ delete lace_size;
return 1;
}
buffer += l;
@@ -3162,7 +3162,7 @@
int64_t snum;
snum = ebml_read_vlen_int (buffer, &l);
if (snum == EBML_INT_INVALID) {
- mp_free(lace_size);
+ delete lace_size;
return 1;
}
buffer += l;
@@ -3551,7 +3551,7 @@
if (tc < 0)
tc = 0;
if (mkv_d->stop_timecode > 0 && tc > mkv_d->stop_timecode) {
- mp_free(lace_size);
+ delete lace_size;
return -1;
}
current_pts = tc / 1000.0;
@@ -3563,7 +3563,7 @@
}
if (track == NULL)
{
- mp_free(lace_size);
+ delete lace_size;
return 1;
}
if (num == demuxer->audio->id)
@@ -3657,7 +3657,7 @@
dp = new_demux_packet (size);
memcpy (dp->buffer, buffer, size);
if (modified)
- mp_free (buffer);
+ delete buffer;
dp->flags = (block_bref == 0 && block_fref == 0) ? 0x10 : 0;
/* If default_duration is 0, assume no pts value is known
* for packets after the first one (rather than all pts
@@ -3678,11 +3678,11 @@
else if (ds == demuxer->audio)
mkv_d->a_skip_to_keyframe = 0;
- mp_free(lace_size);
+ delete lace_size;
return 1;
}
- mp_free(lace_size);
+ delete lace_size;
return 0;
}
@@ -3710,7 +3710,7 @@
{
block_duration = ebml_read_uint (s, &l);
if (block_duration == EBML_UINT_INVALID) {
- mp_free(block);
+ delete block;
return 0;
}
block_duration *= mkv_d->tc_scale / 1000000.0;
@@ -3719,13 +3719,13 @@
case MATROSKA_ID_BLOCK:
block_length = ebml_read_length (s, &tmp);
- mp_free(block);
+ delete block;
if (block_length > std::numeric_limits<size_t>::max()- LZO_INPUT_PADDING) return 0;
block = new uint8_t[block_length + LZO_INPUT_PADDING];
demuxer->filepos = stream_tell (s);
if (stream_read (s,block,block_length) != (int) block_length)
{
- mp_free(block);
+ delete block;
return 0;
}
l = tmp + block_length;
@@ -3735,7 +3735,7 @@
{
int64_t num = ebml_read_int (s, &l);
if (num == EBML_INT_INVALID) {
- mp_free(block);
+ delete block;
return 0;
}
if (num <= 0)
@@ -3746,7 +3746,7 @@
}
case EBML_ID_INVALID:
- mp_free(block);
+ delete block;
return 0;
default:
@@ -3761,7 +3761,7 @@
{
int res = handle_block (demuxer, block, block_length,
block_duration, block_bref, block_fref, 0);
- mp_free (block);
+ delete block;
if (res < 0)
return 0;
if (res)
@@ -3799,13 +3799,13 @@
demuxer->filepos = stream_tell (s);
if (stream_read (s,block,block_length) != (int) block_length)
{
- mp_free(block);
+ delete block;
return 0;
}
l = tmp + block_length;
res = handle_block (demuxer, block, block_length,
block_duration, block_bref, block_fref, 1);
- mp_free (block);
+ delete block;
mkv_d->cluster_size -= l + il;
if (res < 0)
return 0;
Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_mov.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -487,7 +487,7 @@
/* dunno what, but we shoudl ignore it */
break;
default:
- if(no==0){ mp_free(priv); return MPXP_False;} // first chunk is bad!
+ if(no==0){ delete priv; return MPXP_False;} // first chunk is bad!
id = BE_32(id);
MSG_V("MOV: unknown chunk: %.4s %d\n",&id,(int)len);
}
@@ -501,7 +501,7 @@
demuxer->file_format=DEMUXER_TYPE_MOV;
return MPXP_Ok;
}
- mp_free(priv);
+ delete priv;
if ((flags==5) || (flags==7)) // reference & header sent
{
@@ -1236,7 +1236,7 @@
sh->bih=(BITMAPINFOHEADER*)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);
+ delete trak->stream_header;
trak->stream_header_len = 0;
trak->stream_header = NULL;
} else {
@@ -1342,8 +1342,8 @@
lschunks(demuxer,level+1,moov_sz,NULL); // parse uncompr. 'moov'
//free_stream(demuxer->stream);
demuxer->stream=backup;
- mp_free(cmov_buf);
- mp_free(moov_buf);
+ delete cmov_buf;
+ delete moov_buf;
break;
}
#endif
@@ -1537,7 +1537,7 @@
str[_len] = 0;
MSG_V( "MOV: %*sHandler header: %.4s/%.4s (%.4s) %s\n", level, "",
&type, &subtype, &manufact, str);
- mp_free(str);
+ delete str;
switch(bswap_32(type)) {
case MOV_FOURCC('m','h','l','r'):
trak->media_handler = bswap_32(subtype);
@@ -1987,7 +1987,7 @@
dp->pos=stream_tell(demuxer->stream)-trak->stream_header_len;
x=stream_read(demuxer->stream,dp->buffer+trak->stream_header_len,x);
resize_demux_packet(dp,x+trak->stream_header_len);
- mp_free(trak->stream_header);
+ delete trak->stream_header;
trak->stream_header = NULL;
trak->stream_header_len = 0;
dp->pts=pts;
@@ -2073,20 +2073,20 @@
for (i = 0; i < MOV_MAX_TRACKS; i++) {
mov_track_t *track = priv->tracks[i];
if (track) {
- mp_free(track->tkdata);
- mp_free(track->stdata);
- mp_free(track->stream_header);
- mp_free(track->samples);
- mp_free(track->chunks);
- mp_free(track->chunkmap);
- mp_free(track->durmap);
- mp_free(track->keyframes);
- mp_free(track->editlist);
- mp_free(track->desc);
- mp_free(track);
+ delete track->tkdata;
+ delete track->stdata;
+ delete track->stream_header;
+ delete track->samples;
+ delete track->chunks;
+ delete track->chunkmap;
+ delete track->durmap;
+ delete track->keyframes;
+ delete track->editlist;
+ delete track->desc;
+ delete track;
}
}
- mp_free(priv);
+ delete priv;
}
static MPXP_Rc mov_control(const demuxer_t *demuxer,int cmd,any_t*args)
Modified: mplayerxp/libmpdemux/demux_mpg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_mpg.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -807,7 +807,7 @@
static void mpgps_close(demuxer_t*demuxer)
{
mpg_demuxer_t* mpg_d = reinterpret_cast<mpg_demuxer_t*>(demuxer->priv);
- if (mpg_d) mp_free(mpg_d);
+ if (mpg_d) delete mpg_d;
}
static MPXP_Rc mpgps_control(const demuxer_t *demuxer,int cmd,any_t*arg)
Modified: mplayerxp/libmpdemux/demux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -429,7 +429,7 @@
stream_read(s,str,len);
sub_data.cp=nls_get_screen_cp();
demux_info_add(demuxer,infot,nls_recode2screen_cp(codepage,str,len));
- mp_free(str);
+ delete str;
}
else stream_skip(s,len);
}
@@ -483,7 +483,7 @@
{
MSG_ERR("Size of FPRP(%u) != %u\n",fsize,sizeof(mpxpav64FileProperties_t));
open_failed:
- mp_free(priv);
+ delete priv;
return NULL;
}
stream_read(s,(char *)&priv->fprop,sizeof(mpxpav64FileProperties_t));
@@ -885,8 +885,8 @@
unsigned i;
mpxpav64_priv_t* priv=reinterpret_cast<mpxpav64_priv_t*>(demuxer->priv);
if(!priv) return;
- for(i=0;i<MAX_AV_STREAMS;i++) if(priv->idx[i]!=NULL) mp_free(priv->idx[i]);
- mp_free(priv);
+ for(i=0;i<MAX_AV_STREAMS;i++) if(priv->idx[i]!=NULL) delete priv->idx[i];
+ delete priv;
}
static MPXP_Rc mpxpav64_control(const demuxer_t *demuxer,int cmd,any_t*args)
Modified: mplayerxp/libmpdemux/demux_nsv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_nsv.cpp 2012-11-22 10:19:50 UTC (rev 429)
+++ mplayerxp/libmpdemux/demux_nsv.cpp 2012-11-22 12:22:07 UTC (rev 430)
@@ -338,7 +338,7 @@
if(!priv)
return;
- mp_free(priv);
+ delete priv;
}
Modified: mplayerxp/libmpdemux/demux_nuv.cpp
=================================================================...
[truncated message content] |
