diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-09 18:21:04 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-09 18:21:04 +0200 |
| commit | f36b9d822626dbbaf585e70cfa7ea60aa6d194af (patch) | |
| tree | 220b7a7d185f262dc793c14c92a77ea615950d86 /contrib | |
| parent | b6055c5fe61d918259d1c253aa32fa97dd3e5163 (diff) | |
| parent | d5d3776bf7e2733d382c5811b317bcdb7c2c9e88 (diff) | |
| download | xine-lib-f36b9d822626dbbaf585e70cfa7ea60aa6d194af.tar.gz xine-lib-f36b9d822626dbbaf585e70cfa7ea60aa6d194af.tar.bz2 | |
Merge with 1.2 branch.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Makefile.am | 13 | ||||
| -rw-r--r-- | contrib/libfaad/common.h | 2 | ||||
| -rw-r--r-- | contrib/libmpcdec/mpc_decoder.c | 6 |
3 files changed, 12 insertions, 9 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 2258d2fd2..a61af87e0 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -70,16 +70,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 diff --git a/contrib/libfaad/common.h b/contrib/libfaad/common.h index 47832e648..8244a8143 100644 --- a/contrib/libfaad/common.h +++ b/contrib/libfaad/common.h @@ -36,7 +36,7 @@ extern "C" { #define __STRICT_ANSI__ #endif -#include "../config.h" +#include "../include/config.h" #define INLINE __inline #if 0 //defined(_WIN32) && !defined(_WIN32_WCE) 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); |