Commit 9cf74191 authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit 'aac996cc'

* commit 'aac996cc':
  g723_1: Rename files to better reflect their purpose
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents dc97ff83 aac996cc
...@@ -276,9 +276,9 @@ OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o ...@@ -276,9 +276,9 @@ OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o
OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o
OBJS-$(CONFIG_FRWU_DECODER) += frwu.o OBJS-$(CONFIG_FRWU_DECODER) += frwu.o
OBJS-$(CONFIG_G2M_DECODER) += g2meet.o elsdec.o OBJS-$(CONFIG_G2M_DECODER) += g2meet.o elsdec.o
OBJS-$(CONFIG_G723_1_DECODER) += g723_1.o acelp_vectors.o \ OBJS-$(CONFIG_G723_1_DECODER) += g723_1dec.o acelp_vectors.o \
celp_filters.o celp_math.o celp_filters.o celp_math.o
OBJS-$(CONFIG_G723_1_ENCODER) += g723_1.o acelp_vectors.o celp_math.o OBJS-$(CONFIG_G723_1_ENCODER) += g723_1dec.o acelp_vectors.o celp_math.o
OBJS-$(CONFIG_G729_DECODER) += g729dec.o lsp.o celp_math.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o OBJS-$(CONFIG_G729_DECODER) += g729dec.o lsp.o celp_math.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o
OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
* G723.1 compatible decoder data tables * G723.1 compatible decoder data tables
*/ */
#ifndef AVCODEC_G723_1_DATA_H #ifndef AVCODEC_G723_1_H
#define AVCODEC_G723_1_DATA_H #define AVCODEC_G723_1_H
#include <stdint.h> #include <stdint.h>
...@@ -1324,4 +1324,4 @@ static const int cng_filt[4] = { 273, 998, 499, 333 }; ...@@ -1324,4 +1324,4 @@ static const int cng_filt[4] = { 273, 998, 499, 333 };
static const int cng_bseg[3] = { 2048, 18432, 231233 }; static const int cng_bseg[3] = { 2048, 18432, 231233 };
#endif /* AVCODEC_G723_1_DATA_H */ #endif /* AVCODEC_G723_1_H */
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "acelp_vectors.h" #include "acelp_vectors.h"
#include "celp_filters.h" #include "celp_filters.h"
#include "celp_math.h" #include "celp_math.h"
#include "g723_1_data.h" #include "g723_1.h"
#include "internal.h" #include "internal.h"
#define CNG_RANDOM_SEED 12345 #define CNG_RANDOM_SEED 12345
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment