From 12f67b8372d8f7146a2983f24727ea6306aa70c0 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 9 May 2010 14:45:29 +0000 Subject: Remove internal liba52 copy. Nowadays FFmpeg is faster than liba52 and external liba52 is well supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_liba52.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'libmpcodecs/ad_liba52.c') diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index cac671718a..2e2006abc1 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -35,14 +35,9 @@ #include "libaf/af_format.h" -#ifdef CONFIG_LIBA52_INTERNAL -#include "liba52/a52.h" -#include "liba52/mm_accel.h" -#else #include #include int (* a52_resample) (float * _f, int16_t * s16); -#endif static a52_state_t *a52_state; static uint32_t a52_flags=0; @@ -150,11 +145,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; @@ -208,9 +199,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; @@ -283,12 +272,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"); -- cgit v1.2.3