diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2011-02-04 10:06:01 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-02-15 19:20:37 +0200 |
| commit | 30f9c5cd2b60ee48812afe440d9b28a22c40159a (patch) | |
| tree | 41cae97bfd4b8ea012fe68e1faf3c94ee68b5549 | |
| parent | 8aac9fae9b21945751c6575e02f6f0dd6dd6d09e (diff) | |
| download | mpv-30f9c5cd2b60ee48812afe440d9b28a22c40159a.tar.bz2 mpv-30f9c5cd2b60ee48812afe440d9b28a22c40159a.tar.xz | |
cleanup: remove some casts of memalign() return value
Do not pointlessly cast the return value of memalign().
memalign() returns void*, which is compatible with any pointer in C.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32850 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpdemux/video.c | 8 | ||||
| -rw-r--r-- | sub/sub.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 400a995d57..7000ec5f6d 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -129,7 +129,7 @@ switch(video_codec){ } mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); if(!videobuffer) { - videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"Cannot allocate shared memory.\n"); @@ -224,7 +224,7 @@ switch(video_codec){ } mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); if(!videobuffer) { - videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"Cannot allocate shared memory.\n"); @@ -289,7 +289,7 @@ mpeg_header_parser: mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); // ========= Read & process sequence header & extension ============ if(!videobuffer) { - videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"Cannot allocate shared memory.\n"); @@ -357,7 +357,7 @@ mpeg_header_parser: } mp_msg(MSGT_DECVIDEO,MSGL_INFO,"found\n"); if(!videobuffer) { - videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"Cannot allocate shared memory.\n"); @@ -155,8 +155,8 @@ static void alloc_buf(mp_osd_obj_t* obj) obj->allocated = len; free(obj->bitmap_buffer); free(obj->alpha_buffer); - obj->bitmap_buffer = (unsigned char *)memalign(16, len); - obj->alpha_buffer = (unsigned char *)memalign(16, len); + obj->bitmap_buffer = memalign(16, len); + obj->alpha_buffer = memalign(16, len); } memset(obj->bitmap_buffer, sub_bg_color, len); memset(obj->alpha_buffer, sub_bg_alpha, len); |