aboutsummaryrefslogtreecommitdiffstats
path: root/src/inputPlugins
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2006-07-26 03:14:19 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2006-07-26 03:14:19 +0000
commit13cca01c7b3c11539f0f7b4c666a57567ef003a2 (patch)
treed8eb22d169871e13596a7941a8ab08eba0326e25 /src/inputPlugins
parent95293aadcdddba18fb26e20e1ae09825cb4167a3 (diff)
downloadmpd-13cca01c7b3c11539f0f7b4c666a57567ef003a2.tar.gz
mpd-13cca01c7b3c11539f0f7b4c666a57567ef003a2.tar.xz
mpd-13cca01c7b3c11539f0f7b4c666a57567ef003a2.zip
Don't decode the first frame if it has a xing tag, not only if it has a xing tag with a frame count
git-svn-id: https://svn.musicpd.org/mpd/trunk@4464 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/inputPlugins/mp3_plugin.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index 86c3742bb..b6487e7c3 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -646,10 +646,11 @@ static int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc,
}
if (found_xing) {
+ data->muteFrame = MUTEFRAME_SKIP;
+
if (xing.flags & XING_FRAMES) {
mad_timer_t duration = data->frame.header.duration;
mad_timer_multiply(&duration, xing.frames);
- data->muteFrame = MUTEFRAME_SKIP;
data->totalTime = ((float)mad_timer_count(duration, MAD_UNITS_MILLISECONDS)) / 1000;
data->maxFrames = xing.frames;
}