summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_roq.c
diff options
context:
space:
mode:
authorreynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-13 16:41:13 +0000
committerreynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-13 16:41:13 +0000
commit32492483c0783a7b82a45a400527977124575335 (patch)
treedd22c483403cde4552f27adc715366c0e4b941b5 /libmpdemux/demux_roq.c
parent241bfa8a0ca7c52c66fb48f6b9d97a0c7d8db4c2 (diff)
downloadmpv-32492483c0783a7b82a45a400527977124575335.tar.bz2
mpv-32492483c0783a7b82a45a400527977124575335.tar.xz
drops casts from void * on malloc/calloc from libmpdemux code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19067 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_roq.c')
-rw-r--r--libmpdemux/demux_roq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_roq.c b/libmpdemux/demux_roq.c
index b076a9497d..df542bab9d 100644
--- a/libmpdemux/demux_roq.c
+++ b/libmpdemux/demux_roq.c
@@ -92,7 +92,7 @@ static demuxer_t* demux_open_roq(demuxer_t* demuxer)
sh_video_t *sh_video = NULL;
sh_audio_t *sh_audio = NULL;
- roq_data_t *roq_data = (roq_data_t *)malloc(sizeof(roq_data_t));
+ roq_data_t *roq_data = malloc(sizeof(roq_data_t));
int chunk_id;
int chunk_size;
int chunk_arg;
@@ -160,7 +160,7 @@ static demuxer_t* demux_open_roq(demuxer_t* demuxer)
sh_audio->ds = demuxer->audio;
// go through the bother of making a WAVEFORMATEX structure
- sh_audio->wf = (WAVEFORMATEX *)malloc(sizeof(WAVEFORMATEX));
+ sh_audio->wf = malloc(sizeof(WAVEFORMATEX));
// custom fourcc for internal MPlayer use
sh_audio->format = mmioFOURCC('R', 'o', 'Q', 'A');