aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-11-23 17:10:52 -0500
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-11-30 10:58:45 -0500
commitaac996cc01042194bf621d845bbe684549b5882e (patch)
treec7a2cad8b98d89e9c56308fe4a237979a6c18438 /libavcodec
parentb74b88f30da2389f333a31815d8326d5576d3331 (diff)
downloadffmpeg-aac996cc01042194bf621d845bbe684549b5882e.tar.gz
g723_1: Rename files to better reflect their purpose
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/g723_1.h (renamed from libavcodec/g723_1_data.h)6
-rw-r--r--libavcodec/g723_1dec.c (renamed from libavcodec/g723_1.c)2
3 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0cca9ce7f5..dfefab66f8 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -225,7 +225,7 @@ OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o
OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o
OBJS-$(CONFIG_FRWU_DECODER) += frwu.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
OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o
diff --git a/libavcodec/g723_1_data.h b/libavcodec/g723_1.h
index c4c4d77a62..71e2df4ad3 100644
--- a/libavcodec/g723_1_data.h
+++ b/libavcodec/g723_1.h
@@ -25,8 +25,8 @@
* G.723.1 compatible decoder data tables
*/
-#ifndef AVCODEC_G723_1_DATA_H
-#define AVCODEC_G723_1_DATA_H
+#ifndef AVCODEC_G723_1_H
+#define AVCODEC_G723_1_H
#include <stdint.h>
@@ -1198,4 +1198,4 @@ static const int cng_filt[4] = { 273, 998, 499, 333 };
static const int cng_bseg[3] = { 2048, 18432, 231233 };
-#endif /* AVCODEC_G723_1_DATA_H */
+#endif /* AVCODEC_G723_1_H */
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1dec.c
index 80c7d1f491..dc05ed2121 100644
--- a/libavcodec/g723_1.c
+++ b/libavcodec/g723_1dec.c
@@ -33,7 +33,7 @@
#include "get_bits.h"
#include "acelp_vectors.h"
#include "celp_filters.h"
-#include "g723_1_data.h"
+#include "g723_1.h"
#include "internal.h"
#define CNG_RANDOM_SEED 12345