summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorKenan Gillet <kenan.gillet@gmail.com>2008-10-24 21:20:29 +0000
committerDiego Biurrun <diego@biurrun.de>2008-10-24 21:20:29 +0000
commit60c25a4beb1d0df699104ecb8a536d9a09703d2f (patch)
treecde8baa195578bc38a09164b80121792fa8cb77f /libavcodec
parentf96d0eef53485202b3c4c8e4d973567c83dcf851 (diff)
downloadffmpeg-streaming-60c25a4beb1d0df699104ecb8a536d9a09703d2f.zip
ffmpeg-streaming-60c25a4beb1d0df699104ecb8a536d9a09703d2f.tar.gz
Rename acelp_math.[ch] to celp_math.[ch] to prepare for QCELP decoder merge.
patch by Kenan Gillet, kenan.gillet gmail com Originally committed as revision 15679 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/acelp_pitch_delay.c2
-rw-r--r--libavcodec/celp_math.c (renamed from libavcodec/acelp_math.c)2
-rw-r--r--libavcodec/celp_math.h (renamed from libavcodec/acelp_math.h)6
-rw-r--r--libavcodec/g729dec.c2
-rw-r--r--libavcodec/lsp.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c
index 0746588..3db5ea3 100644
--- a/libavcodec/acelp_pitch_delay.c
+++ b/libavcodec/acelp_pitch_delay.c
@@ -22,7 +22,7 @@
#include "avcodec.h"
#include "acelp_pitch_delay.h"
-#include "acelp_math.h"
+#include "celp_math.h"
int ff_acelp_decode_8bit_to_1st_delay3(int ac_index)
{
diff --git a/libavcodec/acelp_math.c b/libavcodec/celp_math.c
index 6c8a017..9fa7dfc 100644
--- a/libavcodec/acelp_math.c
+++ b/libavcodec/celp_math.c
@@ -25,7 +25,7 @@
#include <assert.h>
#include "avcodec.h"
-#include "acelp_math.h"
+#include "celp_math.h"
#ifdef G729_BITEXACT
/**
diff --git a/libavcodec/acelp_math.h b/libavcodec/celp_math.h
index 3843e69..029b531 100644
--- a/libavcodec/acelp_math.h
+++ b/libavcodec/celp_math.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_ACELP_MATH_H
-#define AVCODEC_ACELP_MATH_H
+#ifndef AVCODEC_CELP_MATH_H
+#define AVCODEC_CELP_MATH_H
#include <stdint.h>
@@ -83,4 +83,4 @@ static inline int bidir_sal(int value, int offset)
else return value << offset;
}
-#endif /* AVCODEC_ACELP_MATH_H */
+#endif /* AVCODEC_CELP_MATH_H */
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 6bd814f..5a0bd16 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -32,7 +32,7 @@
#include "g729.h"
#include "lsp.h"
-#include "acelp_math.h"
+#include "celp_math.h"
#include "acelp_filters.h"
#include "acelp_pitch_delay.h"
#include "acelp_vectors.h"
diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c
index 44b3a3f..d2785f7 100644
--- a/libavcodec/lsp.c
+++ b/libavcodec/lsp.c
@@ -26,7 +26,7 @@
#define FRAC_BITS 14
#include "mathops.h"
#include "lsp.h"
-#include "acelp_math.h"
+#include "celp_math.h"
void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, int lsfq_max, int lp_order)
{
OpenPOWER on IntegriCloud