summaryrefslogtreecommitdiff
path: root/contrib/libmpcdec
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-06-09 18:21:04 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-06-09 18:21:04 +0200
commitf36b9d822626dbbaf585e70cfa7ea60aa6d194af (patch)
tree220b7a7d185f262dc793c14c92a77ea615950d86 /contrib/libmpcdec
parentb6055c5fe61d918259d1c253aa32fa97dd3e5163 (diff)
parentd5d3776bf7e2733d382c5811b317bcdb7c2c9e88 (diff)
downloadxine-lib-f36b9d822626dbbaf585e70cfa7ea60aa6d194af.tar.gz
xine-lib-f36b9d822626dbbaf585e70cfa7ea60aa6d194af.tar.bz2
Merge with 1.2 branch.
Diffstat (limited to 'contrib/libmpcdec')
-rw-r--r--contrib/libmpcdec/mpc_decoder.c6
1 files changed, 3 insertions, 3 deletions
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);