diff options
author | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-02 08:17:07 +0000 |
---|---|---|
committer | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-02 08:17:07 +0000 |
commit | 3afd65b3afd338a32af0df8c8f0fdd4d2649c74e (patch) | |
tree | 8ee5d6fc8ccb7bc3f69d49a496f434a27af3c1e5 /libmpcodecs | |
parent | 9d9a15d18572d1450fd8fef495be3629bf85c995 (diff) | |
download | mpv-3afd65b3afd338a32af0df8c8f0fdd4d2649c74e.tar.bz2 mpv-3afd65b3afd338a32af0df8c8f0fdd4d2649c74e.tar.xz |
rm unnecesary casts from void* - part 3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18884 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_libvorbis.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_mpc.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_speex.c | 2 | ||||
-rw-r--r-- | libmpcodecs/dec_audio.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_mpng.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_theora.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_xvid.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_xvid4.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ve_nuv.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_screenshot.c | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/libmpcodecs/ad_libvorbis.c b/libmpcodecs/ad_libvorbis.c index 65944cc0ce..637b4f669f 100644 --- a/libmpcodecs/ad_libvorbis.c +++ b/libmpcodecs/ad_libvorbis.c @@ -72,7 +72,7 @@ static int init(sh_audio_t *sh) } /// Init the decoder with the 3 header packets - ov = (struct ov_struct_st*)malloc(sizeof(struct ov_struct_st)); + ov = malloc(sizeof(struct ov_struct_st)); vorbis_info_init(&ov->vi); vorbis_comment_init(&vc); diff --git a/libmpcodecs/ad_mpc.c b/libmpcodecs/ad_mpc.c index fb00bb6a1f..e91998df7b 100644 --- a/libmpcodecs/ad_mpc.c +++ b/libmpcodecs/ad_mpc.c @@ -203,7 +203,7 @@ static int check_clip(void *buf, int len) { static int control(sh_audio_t *sh, int cmd, void* arg, ...) { if (cmd == ADCTRL_RESYNC_STREAM) { - unsigned char *buf = (unsigned char *)malloc(MAX_FRAMESIZE); + unsigned char *buf = malloc(MAX_FRAMESIZE); int i; int nr_ok = 0; for (i = 0; i < MAX_SEEK_DISCARD; i++) { diff --git a/libmpcodecs/ad_speex.c b/libmpcodecs/ad_speex.c index e78f42629c..21fa5a3d4d 100644 --- a/libmpcodecs/ad_speex.c +++ b/libmpcodecs/ad_speex.c @@ -36,7 +36,7 @@ static int preinit(sh_audio_t *sh) { } static int init(sh_audio_t *sh) { - context_t *ctx = (context_t *)calloc(1, sizeof(context_t)); + context_t *ctx = calloc(1, sizeof(context_t)); const SpeexMode *spx_mode; const SpeexStereoState st_st = SPEEX_STEREO_STATE_INIT; // hack if (!sh->wf || sh->wf->cbSize < 80) { diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 2a6d152eb7..37ab41875b 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -290,7 +290,7 @@ int init_audio_filters(sh_audio_t *sh_audio, int out_minsize, int out_maxsize){ af_stream_t* afs=sh_audio->afilter; if(!afs){ - afs = (af_stream_t*)malloc(sizeof(af_stream_t)); + afs = malloc(sizeof(af_stream_t)); memset(afs,0,sizeof(af_stream_t)); } diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index e312e800fd..ea2091f206 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -383,7 +383,7 @@ static int init(sh_video_t *sh){ /* Pass palette to codec */ #if LIBAVCODEC_BUILD >= 4689 if (sh->bih && (sh->bih->biBitCount <= 8)) { - avctx->palctrl = (AVPaletteControl*)calloc(1,sizeof(AVPaletteControl)); + avctx->palctrl = calloc(1,sizeof(AVPaletteControl)); avctx->palctrl->palette_changed = 1; if (sh->bih->biSize-sizeof(BITMAPINFOHEADER)) /* Palette size in biSize */ diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c index a92852cfec..9d99145ee6 100644 --- a/libmpcodecs/vd_mpng.c +++ b/libmpcodecs/vd_mpng.c @@ -135,7 +135,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ if(!mpi) return NULL; // Let's DECODE! - row_p=(png_bytep*)malloc( sizeof( png_bytep ) * png_height ); + row_p=malloc( sizeof( png_bytep ) * png_height ); //png_get_rowbytes( png,info ) for ( i=0; i < png_height; i++ ) row_p[i]=mpi->planes[0] + mpi->stride[0]*i; png_read_image( png,row_p ); diff --git a/libmpcodecs/vd_theora.c b/libmpcodecs/vd_theora.c index de9d478c62..6bf1248155 100644 --- a/libmpcodecs/vd_theora.c +++ b/libmpcodecs/vd_theora.c @@ -64,7 +64,7 @@ static int init(sh_video_t *sh){ /* this is not a loop, just a context, from which we can break on error */ do { - context = (theora_struct_t *)calloc (sizeof (theora_struct_t), 1); + context = calloc (sizeof (theora_struct_t), 1); sh->context = context; if (!context) break; diff --git a/libmpcodecs/vd_xvid.c b/libmpcodecs/vd_xvid.c index b3b2ac4714..298d66685f 100644 --- a/libmpcodecs/vd_xvid.c +++ b/libmpcodecs/vd_xvid.c @@ -152,7 +152,7 @@ static int init(sh_video_t *sh){ return 0; } - p = (priv_t*)malloc(sizeof(priv_t)); + p = malloc(sizeof(priv_t)); p->cs = cs; p->hdl = dec_p.handle; sh->context = p; diff --git a/libmpcodecs/vd_xvid4.c b/libmpcodecs/vd_xvid4.c index a2471ead3c..335c101752 100644 --- a/libmpcodecs/vd_xvid4.c +++ b/libmpcodecs/vd_xvid4.c @@ -174,7 +174,7 @@ static int init(sh_video_t *sh) return(0); } - p = (priv_t*)malloc(sizeof(priv_t)); + p = malloc(sizeof(priv_t)); p->cs = cs; p->hdl = dec_p.handle; p->vo_initialized = 0; diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c index 7d3706821e..4ed2e20dac 100644 --- a/libmpcodecs/ve_nuv.c +++ b/libmpcodecs/ve_nuv.c @@ -217,7 +217,7 @@ static int vf_open(vf_instance_t *vf, char* args){ vf->priv->lzo = 0; } vf->priv->zbuffer = (lzo_bytep)malloc(FRAMEHEADERSIZE + LZO_OUT_LEN); - vf->priv->zmem = (long*)malloc(sizeof(long)*LZO_AL(LZO1X_1_MEM_COMPRESS)); + vf->priv->zmem = malloc(sizeof(long)*LZO_AL(LZO1X_1_MEM_COMPRESS)); } return 1; diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c index 2239eb016d..54939acc50 100644 --- a/libmpcodecs/vf_screenshot.c +++ b/libmpcodecs/vf_screenshot.c @@ -87,7 +87,7 @@ static void write_png(char *fname, unsigned char *buffer, int width, int height, png_set_bgr(png_ptr); - row_pointers = (png_byte**)malloc(height*sizeof(png_byte*)); + row_pointers = malloc(height*sizeof(png_byte*)); for (k = 0; k < height; k++) { unsigned char* s=buffer + stride*k; row_pointers[k] = s; |