summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_audio.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_audio.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_audio.c')
-rw-r--r--libmpdemux/demux_audio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 3aef23378a..712d193ffa 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -419,7 +419,7 @@ static int demux_audio_open(demuxer_t* demuxer) {
free_sh_audio(demuxer, 0);
return 0;
}
- sh_audio->wf = w = (WAVEFORMATEX*)malloc(l > sizeof(WAVEFORMATEX) ? l : sizeof(WAVEFORMATEX));
+ sh_audio->wf = w = malloc(l > sizeof(WAVEFORMATEX) ? l : sizeof(WAVEFORMATEX));
w->wFormatTag = sh_audio->format = stream_read_word_le(s);
w->nChannels = sh_audio->channels = stream_read_word_le(s);
w->nSamplesPerSec = sh_audio->samplerate = stream_read_dword_le(s);
@@ -522,7 +522,7 @@ static int demux_audio_open(demuxer_t* demuxer) {
break;
}
- priv = (da_priv_t*)malloc(sizeof(da_priv_t));
+ priv = malloc(sizeof(da_priv_t));
priv->frmt = frmt;
priv->last_pts = -1;
demuxer->priv = priv;