diff options
| author | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-03 13:21:54 +0000 |
|---|---|---|
| committer | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-03 13:21:54 +0000 |
| commit | 8f65768bf28cebdaf85ef75d9b0d22bfc35f6fd9 (patch) | |
| tree | 5ed058c4a8f3272b6d8acc136ec13c1491a9c235 /libmpdemux/demux_mkv.c | |
| parent | 92f2863d63b75e30f13473a5d76cdb19cd5fc982 (diff) | |
| download | mpv-8f65768bf28cebdaf85ef75d9b0d22bfc35f6fd9.tar.bz2 mpv-8f65768bf28cebdaf85ef75d9b0d22bfc35f6fd9.tar.xz | |
rm unnecesary casts from void* - part 4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18890 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 2fc370b7a6..de75f00748 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -503,7 +503,7 @@ demux_mkv_parse_idx (mkv_track_t *t) return 0; things_found = 0; - buf = (char *)malloc(t->private_size + 1); + buf = malloc(t->private_size + 1); if (buf == NULL) return 0; memcpy(buf, t->private_data, t->private_size); @@ -1891,7 +1891,7 @@ demux_mkv_open_audio (demuxer_t *demuxer, mkv_track_t *track) track->qt_last_a_pts = 0.0; if (track->private_data != NULL) { - sh_a->codecdata=(unsigned char *)malloc(track->private_size); + sh_a->codecdata=malloc(track->private_size); memcpy (sh_a->codecdata, track->private_data, track->private_size); sh_a->codecdata_len = track->private_size; @@ -1907,7 +1907,7 @@ demux_mkv_open_audio (demuxer_t *demuxer, mkv_track_t *track) if (!strcmp (track->codec_id, MKV_A_AAC) && (NULL != track->private_data)) { - sh_a->codecdata=(unsigned char *)malloc(track->private_size); + sh_a->codecdata=malloc(track->private_size); memcpy (sh_a->codecdata, track->private_data, track->private_size); sh_a->codecdata_len = track->private_size; @@ -2495,7 +2495,7 @@ demux_mkv_read_block_lacing (uint8_t *buffer, uint64_t *size, { case 0: /* no lacing */ *laces = 1; - lace_size = (uint32_t *)calloc(*laces, sizeof(uint32_t)); + lace_size = calloc(*laces, sizeof(uint32_t)); lace_size[0] = *size; break; @@ -2505,7 +2505,7 @@ demux_mkv_read_block_lacing (uint8_t *buffer, uint64_t *size, *laces = *buffer++; (*size)--; (*laces)++; - lace_size = (uint32_t *)calloc(*laces, sizeof(uint32_t)); + lace_size = calloc(*laces, sizeof(uint32_t)); switch ((flags & 0x06) >> 1) { |