summaryrefslogtreecommitdiff
path: root/apps/codecs
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-12-11 16:08:53 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-12-11 16:08:53 +0000
commit2b3bb1e84b79665fa1d733e1cc8223a9c70dbb03 (patch)
tree19de54519bb6d254b69ecfa6d2c22503ddfc47c0 /apps/codecs
parent489436385f6f4543c3bc7e2d4c945f2440a611bb (diff)
downloadrockbox-2b3bb1e84b79665fa1d733e1cc8223a9c70dbb03.zip
rockbox-2b3bb1e84b79665fa1d733e1cc8223a9c70dbb03.tar.gz
rockbox-2b3bb1e84b79665fa1d733e1cc8223a9c70dbb03.tar.bz2
rockbox-2b3bb1e84b79665fa1d733e1cc8223a9c70dbb03.tar.xz
Roll back the latest mpc upstream sync as this introduced a regression. Fixes FS#12429.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31211 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r--apps/codecs/libmusepack/mpc_demux.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/codecs/libmusepack/mpc_demux.c b/apps/codecs/libmusepack/mpc_demux.c
index 3f4c9d0..9523163 100644
--- a/apps/codecs/libmusepack/mpc_demux.c
+++ b/apps/codecs/libmusepack/mpc_demux.c
@@ -625,15 +625,10 @@ static mpc_status mpc_demux_decode_inner(mpc_demux * d, mpc_frame_info * i)
}
mpc_status mpc_demux_decode(mpc_demux * d, mpc_frame_info * i) {
- for(;;) {
- // mpc_demux_decode_inner may return 0 samples and require repeated calls after a seek. Loop over until we have data to return.
mpc_status s = mpc_demux_decode_inner(d, i);
if (MPC_IS_FAILURE(s))
i->bits = -1; // we pretend it's end of file
-
- if (MPC_IS_FAILURE(s) || i->samples > 0)
- return s;
- }
+ return s;
}
/* rockbox: not used