summaryrefslogtreecommitdiff
path: root/apps/codecs/speex.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/codecs/speex.c')
-rw-r--r--apps/codecs/speex.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/codecs/speex.c b/apps/codecs/speex.c
index e38a044..7a1efa9 100644
--- a/apps/codecs/speex.c
+++ b/apps/codecs/speex.c
@@ -393,6 +393,9 @@ enum codec_status codec_main(void)
void *st = NULL;
int j = 0;
+ memset(&bits, 0, sizeof(bits));
+ memset(&oy, 0, sizeof(oy));
+
/* Ogg handling still uses mallocs, so reset the malloc buffer per track */
next_track:
error = CODEC_OK;
@@ -401,16 +404,16 @@ next_track:
error = CODEC_ERROR;
goto exit;
}
+
stereo = speex_stereo_state_init();
+ spx_ogg_sync_init(&oy);
+ spx_ogg_alloc_buffer(&oy,2*CHUNKSIZE);
if (codec_wait_taginfo() != 0)
goto done;
strtoffset = ci->id3->offset;
- spx_ogg_sync_init(&oy);
- spx_ogg_alloc_buffer(&oy,2*CHUNKSIZE);
-
samplerate = ci->id3->frequency;
codec_set_replaygain(ci->id3);
@@ -558,7 +561,8 @@ done:
/* Clean things up for the next track */
- speex_decoder_destroy(st);
+ if (st)
+ speex_decoder_destroy(st);
if (stream_init == 1)
spx_ogg_stream_reset(&os);