summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-01-01 14:27:41 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-31 16:00:58 +0200
commit42ed53f221dc6570b7f6e05ef93f38b7457a68d8 (patch)
tree457bc346edf64f3affb2bee9870c106fc03f866c /libmpcodecs
parentf6fb536f87e687a4aacca75dd9ad1c7b71ffa731 (diff)
downloadmpv-42ed53f221dc6570b7f6e05ef93f38b7457a68d8.tar.bz2
mpv-42ed53f221dc6570b7f6e05ef93f38b7457a68d8.tar.xz
libfaad2:/ Remove forked internal libfaad2 copy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32741 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove AAC/FAAD2 installation instructions. There is nothing special about building and installing FAAD2, so there is no longer a need to keep maintaining instructions for it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32742 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ad_faad.c33
1 files changed, 1 insertions, 32 deletions
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c
index 63989b2a10..be074d99be 100644
--- a/libmpcodecs/ad_faad.c
+++ b/libmpcodecs/ad_faad.c
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <faad.h>
#include "config.h"
#include "options.h"
@@ -40,12 +41,6 @@ static const ad_info_t info =
LIBAD_EXTERN(faad)
-#ifndef CONFIG_FAAD_INTERNAL
-#include <faad.h>
-#else
-#include "libfaad2/faad.h"
-#endif
-
/* configure maximum supported channels, *
* this is theoretically max. 64 chans */
#define FAAD_MAX_CHANNELS 8
@@ -134,30 +129,9 @@ static int init(sh_audio_t *sh)
mp_msg(MSGT_DECAUDIO, MSGL_FATAL, "Could not get audio data!\n");
return 0;
}
-#if CONFIG_FAAD_INTERNAL
- /* init the codec, look for LATM */
- faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
- sh->a_in_buffer_len, &faac_samplerate, &faac_channels,1);
- if (faac_init < 0 && sh->a_in_buffer_len >= 3 && sh->format == mmioFOURCC('M', 'P', '4', 'L')) {
- // working LATM not found at first try, look further on in stream
- int i;
-
- for (i = 0; i < 5; i++) {
- pos = sh->a_in_buffer_len-3;
- memmove(sh->a_in_buffer, &(sh->a_in_buffer[pos]), 3);
- sh->a_in_buffer_len = 3;
- sh->a_in_buffer_len += demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len],
- sh->a_in_buffer_size - sh->a_in_buffer_len);
- faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
- sh->a_in_buffer_len, &faac_samplerate, &faac_channels,1);
- if (faac_init >= 0) break;
- }
- }
-#else
/* external faad does not have latm lookup support */
faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
sh->a_in_buffer_len, &faac_samplerate, &faac_channels);
-#endif
if (faac_init < 0) {
pos = aac_probe(sh->a_in_buffer, sh->a_in_buffer_len);
@@ -171,13 +145,8 @@ static int init(sh_audio_t *sh)
}
/* init the codec */
-#if CONFIG_FAAD_INTERNAL
- faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
- sh->a_in_buffer_len, &faac_samplerate, &faac_channels,0);
-#else
faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
sh->a_in_buffer_len, &faac_samplerate, &faac_channels);
-#endif
}
sh->a_in_buffer_len -= (faac_init > 0)?faac_init:0; // how many bytes init consumed