From 395281c7a090bebaa3a27b112bd526cf8b42a788 Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Mon, 22 Mar 2004 18:44:15 +0000 Subject: fix error reporting for mp4 files git-svn-id: https://svn.musicpd.org/mpd/trunk@370 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/mp4_decode.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/mp4_decode.c') diff --git a/src/mp4_decode.c b/src/mp4_decode.c index e9e3d22eb..6ecce1853 100644 --- a/src/mp4_decode.c +++ b/src/mp4_decode.c @@ -223,15 +223,6 @@ int mp4_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc) { sampleBuffer = faacDecDecode(decoder,&frameInfo,mp4Buffer, mp4BufferSize); - if(dc->start) { - channels = frameInfo.channels; - scale = frameInfo.samplerate; - af->channels = frameInfo.channels; - af->sampleRate = frameInfo.samplerate; - dc->state = DECODE_STATE_DECODE; - dc->start = 0; - } - if(mp4Buffer) free(mp4Buffer); if(frameInfo.error > 0) { ERROR("error decoding MP4 file: %s\n",dc->file); @@ -241,6 +232,15 @@ int mp4_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc) { break; } + if(dc->start) { + channels = frameInfo.channels; + scale = frameInfo.samplerate; + af->channels = frameInfo.channels; + af->sampleRate = frameInfo.samplerate; + dc->state = DECODE_STATE_DECODE; + dc->start = 0; + } + if(channels*(dur+offset) > frameInfo.samples) { dur = frameInfo.samples/channels; offset = 0; -- cgit v1.2.3