aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-02-27 18:35:31 +0100
committerMax Kellermann <max@duempel.org>2010-02-27 18:35:31 +0100
commit35c5a371ea3530796e88bcdd556e488816dff20f (patch)
tree4f8f951cc6479bfb11ffad328034ae564fca0514
parent728c66e7e3e235ee88eaaf856a00b318823abff1 (diff)
downloadmpd-35c5a371ea3530796e88bcdd556e488816dff20f.tar.gz
mpd-35c5a371ea3530796e88bcdd556e488816dff20f.tar.xz
mpd-35c5a371ea3530796e88bcdd556e488816dff20f.zip
decoder/mad: fix crash when seeking at end of song
Removed the decoder_command_finished() call at the end of mp3_decode(). This is invalid, because decoder_command_finished() has already been called in mp3_read().
-rw-r--r--NEWS2
-rw-r--r--src/decoder/mad_plugin.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index e6e444d11..476553ff5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
ver 0.15.9 (2009/??/??)
+* decoders:
+ - mad: fix crash when seeking at end of song
ver 0.15.8 (2010/01/17)
diff --git a/src/decoder/mad_plugin.c b/src/decoder/mad_plugin.c
index 1ef7183fa..7cc78a0d2 100644
--- a/src/decoder/mad_plugin.c
+++ b/src/decoder/mad_plugin.c
@@ -1207,10 +1207,6 @@ mp3_decode(struct decoder *decoder, struct input_stream *input_stream)
if (replay_gain_info)
replay_gain_info_free(replay_gain_info);
- if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK &&
- data.mute_frame == MUTEFRAME_SEEK)
- decoder_command_finished(decoder);
-
mp3_data_finish(&data);
}