diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-01 06:51:44 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-01 06:51:44 +0000 |
| commit | 244bd237fba7d3f05fcba1dd986cba3e4a14c2e0 (patch) | |
| tree | 539e684c7ee73ed02a0ba182f7d9000b52c7c957 /libmpcodecs | |
| parent | 8338fa9ecf2a5854757bb1c7dcc41f0ffd832d0a (diff) | |
| download | mpv-244bd237fba7d3f05fcba1dd986cba3e4a14c2e0.tar.bz2 mpv-244bd237fba7d3f05fcba1dd986cba3e4a14c2e0.tar.xz | |
Simplify audio buffer allocation logic
Remove code that set sh_audio->a_out_buffer to equal
sh_audio->a_buffer between the calls to init_best_audio_codec and
init_audio_filters. Nothing uses the buffer between those calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24912 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/dec_audio.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 08c97bea38..f9a6f2753a 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -120,9 +120,9 @@ int init_audio_codec(sh_audio_t *sh_audio) "ID_AUDIO_BITRATE=%d\nID_AUDIO_RATE=%d\n" "ID_AUDIO_NCH=%d\n", sh_audio->i_bps * 8, sh_audio->samplerate, sh_audio->channels); - sh_audio->a_out_buffer_size = sh_audio->a_buffer_size; - sh_audio->a_out_buffer = sh_audio->a_buffer; - sh_audio->a_out_buffer_len = sh_audio->a_buffer_len; + sh_audio->a_out_buffer_size = 0; + sh_audio->a_out_buffer = NULL; + sh_audio->a_out_buffer_len = 0; return 1; } @@ -299,8 +299,7 @@ void uninit_audio(sh_audio_t *sh_audio) #endif sh_audio->inited = 0; } - if (sh_audio->a_out_buffer != sh_audio->a_buffer) - free(sh_audio->a_out_buffer); + free(sh_audio->a_out_buffer); sh_audio->a_out_buffer = NULL; sh_audio->a_out_buffer_size = 0; if (sh_audio->a_buffer) @@ -370,8 +369,7 @@ int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate, out_maxsize = MAX_OUTBURST; // not sure this is ok sh_audio->a_out_buffer_size = out_maxsize; - if (sh_audio->a_out_buffer != sh_audio->a_buffer) - free(sh_audio->a_out_buffer); + 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; |