diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-23 00:23:41 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-23 00:23:41 +0100 |
| commit | dca820a7cb6f1087f6d29482a1ee6d4916fc9f71 (patch) | |
| tree | e42e74888521dc2aab4ff017a96af2f20c2309c8 /src | |
| parent | 043954da568e99adc3585c8d40999fc632cf0319 (diff) | |
| parent | 13ceff6eca6ec498ea21738fd83744b218f8e636 (diff) | |
| download | xine-lib-dca820a7cb6f1087f6d29482a1ee6d4916fc9f71.tar.gz xine-lib-dca820a7cb6f1087f6d29482a1ee6d4916fc9f71.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/liba52/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_dec/xine_a52_decoder.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c index e34504553..d05325618 100644 --- a/src/audio_dec/xine_a52_decoder.c +++ b/src/audio_dec/xine_a52_decoder.c @@ -673,8 +673,25 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre this->pts_list[0] = 0; this->pts_list_position = 0; - if( !this->a52_state ) - this->a52_state = a52_init (xine_mm_accel()); + if( !this->a52_state ) { + this->a52_state = +#ifdef HAVE_A52DEC_A52_H /* External liba52 */ + /* When using external liba52, enable _all_ capabilities, even + if that might break stuff if they add some new capability + that depends on CPU's caps. + At the moment the only capability is DJBFFT, which is tested + only if djbfft is being used at compile time. + + The actual question would be: why don't they check for + capabilities themselves? + */ +#warning "Enabling all external liba52 capabilities." + a52_init (0xFFFFFFFF) +#else + a52_init (xine_mm_accel()) +#endif + ; + } /* * find out if this driver supports a52 output |