summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/ad_msadpcm.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-01 17:58:04 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-01 17:58:04 +0000
commitaff40c7823d8bcbe1c1d2c259601150bdeffa998 (patch)
tree98dbf28ee8afa11095544a0cb68b22921d34cba1 /libmpcodecs/ad_msadpcm.c
parente8236a8ab65e16a8d131f16ce6b892b71299ca02 (diff)
downloadmpv-aff40c7823d8bcbe1c1d2c259601150bdeffa998.tar.bz2
mpv-aff40c7823d8bcbe1c1d2c259601150bdeffa998.tar.xz
audio input buffer allocation/free cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5459 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ad_msadpcm.c')
-rw-r--r--libmpcodecs/ad_msadpcm.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libmpcodecs/ad_msadpcm.c b/libmpcodecs/ad_msadpcm.c
index 4a56c4c1fc..0c662ec945 100644
--- a/libmpcodecs/ad_msadpcm.c
+++ b/libmpcodecs/ad_msadpcm.c
@@ -66,8 +66,8 @@ static int preinit(sh_audio_t *sh_audio)
sh_audio->audio_out_minsize = sh_audio->wf->nBlockAlign * 4;
sh_audio->ds->ss_div =
(sh_audio->wf->nBlockAlign - MS_ADPCM_PREAMBLE_SIZE) * 2;
+ sh_audio->audio_in_minsize =
sh_audio->ds->ss_mul = sh_audio->wf->nBlockAlign;
-
return 1;
}
@@ -78,16 +78,11 @@ static int init(sh_audio_t *sh_audio)
sh_audio->i_bps = sh_audio->wf->nBlockAlign *
(sh_audio->channels*sh_audio->samplerate) / sh_audio->ds->ss_div;
- if ((sh_audio->a_in_buffer =
- (unsigned char *)malloc(sh_audio->ds->ss_mul)) == NULL)
- return 0;
-
return 1;
}
static void uninit(sh_audio_t *sh_audio)
{
- free(sh_audio->a_in_buffer);
}
static int control(sh_audio_t *sh,int cmd,void* arg, ...)