summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rbcodec/codecs')
-rw-r--r--lib/rbcodec/codecs/adx.c2
-rw-r--r--lib/rbcodec/codecs/codecs.make2
-rw-r--r--lib/rbcodec/codecs/lib/SOURCES1
-rw-r--r--lib/rbcodec/codecs/lib/fixedpoint.c1
-rw-r--r--lib/rbcodec/codecs/lib/fixedpoint.h26
5 files changed, 2 insertions, 30 deletions
diff --git a/lib/rbcodec/codecs/adx.c b/lib/rbcodec/codecs/adx.c
index 0c67fc8d6e..83ced5add0 100644
--- a/lib/rbcodec/codecs/adx.c
+++ b/lib/rbcodec/codecs/adx.c
@@ -23,7 +23,7 @@
23#include "codeclib.h" 23#include "codeclib.h"
24#include "inttypes.h" 24#include "inttypes.h"
25#include "math.h" 25#include "math.h"
26#include "lib/fixedpoint.h" 26#include "fixedpoint.h"
27 27
28CODEC_HEADER 28CODEC_HEADER
29 29
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make
index eea8950d0d..21bb9332b3 100644
--- a/lib/rbcodec/codecs/codecs.make
+++ b/lib/rbcodec/codecs/codecs.make
@@ -19,7 +19,7 @@ include $(RBCODECLIB_DIR)/codecs/lib/libcodec.make
19OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib 19OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib
20 20
21# extra libraries 21# extra libraries
22CODEC_LIBS := $(CODECLIB) 22CODEC_LIBS := $(CODECLIB) $(FIXEDPOINTLIB)
23 23
24# the codec libraries 24# the codec libraries
25include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make 25include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make
diff --git a/lib/rbcodec/codecs/lib/SOURCES b/lib/rbcodec/codecs/lib/SOURCES
index 257dcb5838..f4b951a5eb 100644
--- a/lib/rbcodec/codecs/lib/SOURCES
+++ b/lib/rbcodec/codecs/lib/SOURCES
@@ -1,6 +1,5 @@
1#if CONFIG_CODEC == SWCODEC /* software codec platforms */ 1#if CONFIG_CODEC == SWCODEC /* software codec platforms */
2codeclib.c 2codeclib.c
3fixedpoint.c
4ffmpeg_bitstream.c 3ffmpeg_bitstream.c
5 4
6mdct_lookup.c 5mdct_lookup.c
diff --git a/lib/rbcodec/codecs/lib/fixedpoint.c b/lib/rbcodec/codecs/lib/fixedpoint.c
deleted file mode 100644
index a66dcb1270..0000000000
--- a/lib/rbcodec/codecs/lib/fixedpoint.c
+++ /dev/null
@@ -1 +0,0 @@
1#include "../../../apps/fixedpoint.c"
diff --git a/lib/rbcodec/codecs/lib/fixedpoint.h b/lib/rbcodec/codecs/lib/fixedpoint.h
deleted file mode 100644
index 3d8e77cd89..0000000000
--- a/lib/rbcodec/codecs/lib/fixedpoint.h
+++ /dev/null
@@ -1,26 +0,0 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2006 Jens Arnold
11 *
12 * Fixed point library for codecs
13 *
14 * This program is free software; you can redistribute it and/or
15 * modify it under the terms of the GNU General Public License
16 * as published by the Free Software Foundation; either version 2
17 * of the License, or (at your option) any later version.
18 *
19 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
20 * KIND, either express or implied.
21 *
22 ****************************************************************************/
23#ifndef _FIXEDPOINT_H_CODECS
24#define _FIXEDPOINT_H_CODECS
25#include "../../../../firmware/include/fixedpoint.h"
26#endif /* _FIXEDPOINT_H_CODECS */