diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-01 06:52:23 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-01 06:52:23 +0000 |
| commit | 2d44426648879d19e99983ba636637716abdd9b8 (patch) | |
| tree | 4b69ea686e7c1c00a754913d71bdc6c28a61832b /libmpcodecs | |
| parent | 1844e1dd0c15c18ea4781475fd1f1d62c0098ebc (diff) | |
| download | mpv-2d44426648879d19e99983ba636637716abdd9b8.tar.bz2 mpv-2d44426648879d19e99983ba636637716abdd9b8.tar.xz | |
audio: simplify buffer allocation code
Remove the code allocating sh_audio->a_out_buffer from
init_audio_filters() and let the buffer be allocated by the new
dynamic allocation code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24921 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/dec_audio.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index ee6295d2ca..eb11650f59 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -363,19 +363,8 @@ int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate, *out_channels = afs->output.nch; *out_format = afs->output.format; - if (out_maxsize || out_minsize) { - // allocate the a_out_* buffers: - if (out_maxsize < out_minsize) - out_maxsize = out_minsize; - if (out_maxsize < 8192) - out_maxsize = MAX_OUTBURST; // not sure this is ok - - sh_audio->a_out_buffer_size = out_maxsize; - free(sh_audio->a_out_buffer); - sh_audio->a_out_buffer = memalign(16, sh_audio->a_out_buffer_size); - memset(sh_audio->a_out_buffer, 0, sh_audio->a_out_buffer_size); - sh_audio->a_out_buffer_len = 0; - } + sh_audio->a_out_buffer_len = 0; + // ok! sh_audio->afilter = (void *) afs; return 1; |