diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | contrib/libmpcdec/mpc_decoder.c | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -8,7 +8,7 @@ xine-lib (1.1.90) (Unreleased) * Use FFmpeg's own buildsystem, rather than wrapping automake around its sources; this allows to enable/disable FFmpeg features easily, and allow to properly support --disable-ffmpeg-(uncommon|popular)-codecs. - * Update libmpcdec (formerly libmusepack) to version 1.2.5 (newer than the + * Update libmpcdec (formerly libmusepack) to version 1.2.6 (newer than the previous Subversion snapshot) and contestually move it to contrib/libmpcdec to separate from xine's own code. * Save plugins' cache in the defined cache home directory as per XDG Base diff --git a/contrib/libmpcdec/mpc_decoder.c b/contrib/libmpcdec/mpc_decoder.c index 0617869c8..a7b31c970 100644 --- a/contrib/libmpcdec/mpc_decoder.c +++ b/contrib/libmpcdec/mpc_decoder.c @@ -244,8 +244,8 @@ mpc_decoder_reset_globals(mpc_decoder *d) memset(d->Y_L , 0, sizeof d->Y_L ); memset(d->Y_R , 0, sizeof d->Y_R ); - memset(d->SCF_Index_L , 1, sizeof d->SCF_Index_L ); - memset(d->SCF_Index_R , 1, sizeof d->SCF_Index_R ); + memset(d->SCF_Index_L , 0, sizeof d->SCF_Index_L ); + memset(d->SCF_Index_R , 0, sizeof d->SCF_Index_R ); memset(d->Res_L , 0, sizeof d->Res_L ); memset(d->Res_R , 0, sizeof d->Res_R ); memset(d->SCFI_L , 0, sizeof d->SCFI_L ); @@ -1185,7 +1185,7 @@ mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si) mpc_decoder_seek(d, get_initial_fpos(d)); d->seeking_pwr = 0; - while (d->OverallFrames > (SEEKING_TABLE_SIZE << d->seeking_pwr)) + while( d->OverallFrames > ((mpc_int64_t) SEEKING_TABLE_SIZE << d->seeking_pwr) ) d->seeking_pwr++; d->seeking_table_frames = 0; d->seeking_table[0] = get_initial_fpos(d); |