diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:27:58 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:27:58 +0300 |
| commit | 6f199ab3d97a1a5831f261fd5fc46d592ae1cdff (patch) | |
| tree | a785da88f8fc1ffd73619d528bfac70a795d2f51 /libmpcodecs | |
| parent | 18657beb190b3e4acc6404c3b87e6eafbd22de3c (diff) | |
| parent | 8c9cb24a48373330e9bfd4568eb7987890b19f8f (diff) | |
| download | mpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.bz2 mpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.xz | |
Merge svn changes up to r31169
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_liba52.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index aef29b1e13..29e546a602 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -34,14 +34,9 @@ #include "libaf/af_format.h" -#ifdef CONFIG_LIBA52_INTERNAL -#include "liba52/a52.h" -#include "liba52/mm_accel.h" -#else #include <a52dec/a52.h> #include <a52dec/mm_accel.h> int (* a52_resample) (float * _f, int16_t * s16); -#endif static a52_state_t *a52_state; static uint32_t a52_flags=0; @@ -149,11 +144,7 @@ static int preinit(sh_audio_t *sh) { /* Dolby AC3 audio: */ /* however many channels, 2 bytes in a word, 256 samples in a block, 6 blocks in a frame */ -#ifdef CONFIG_LIBA52_INTERNAL - if (sh->samplesize < 2) sh->samplesize = 2; -#else if (sh->samplesize < 4) sh->samplesize = 4; -#endif sh->audio_out_minsize=audio_output_channels*sh->samplesize*256*6; sh->audio_in_minsize=3840; a52_level = 1.0; @@ -207,9 +198,7 @@ static int init(sh_audio_t *sh_audio) mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 init failed\n"); return 0; } -#ifndef CONFIG_LIBA52_INTERNAL sh_audio->sample_format = AF_FORMAT_FLOAT_NE; -#endif if(a52_fillbuff(sh_audio)<0){ mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 sync failed\n"); return 0; @@ -282,12 +271,7 @@ while(sh_audio->channels>0){ break; } } else -#ifdef CONFIG_LIBA52_INTERNAL - if(a52_resample_init(a52_accel,flags,sh_audio->channels)) break; - --sh_audio->channels; /* try to decrease no. of channels*/ -#else break; -#endif } if(sh_audio->channels<=0){ mp_msg(MSGT_DECAUDIO,MSGL_ERR,"a52: no resampler. try different channel setup!\n"); |