From b002c484a3d9a3288dc812252d17f9bb2d0e6b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 3 Jun 2007 22:47:51 +0200 Subject: Update libmpcdec code to 1.2.6 version. --- contrib/libmpcdec/mpc_decoder.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib') 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); -- cgit v1.2.3 From a3571c71d767bd68f7245a46dae1d8f04a91eff9 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Mon, 4 Jun 2007 21:18:49 +0200 Subject: pending a real fix --enable-debug for libxine does not enable debugging options for ffmpeg for now --- contrib/Makefile.am | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 76b63d100..5f26fd25c 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -52,16 +52,19 @@ configure_options =\ --disable-shared --enable-static --disable-demuxers --disable-muxers --disable-strip \ --enable-gpl --enable-pthreads --disable-ffmpeg --disable-ffserver --disable-ffplay -if DEBUG_BUILD -configure_options += --enable-debug -else +# --enable-debug --disable-opts breaks the build of ffmpeg on x86: +# i386/mpegvideo_mmx_template.c:108: error: can't find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ +# pending a real fix --enable-debug for libxine does not enable debugging options for ffmpeg for now +#if DEBUG_BUILD +#configure_options += --enable-debug +#else configure_options += --disable-debug -endif +#endif if PROFILING_BUILD configure_options += --enable-gprof endif if DISABLE_OPTIMIZATIONS -configure_options += --disable-opts +#configure_options += --disable-opts endif if HAVE_MLIB configure_options += --enable-sunmlib -- cgit v1.2.3