Merge commit 'aac996cc01042194bf621d845bbe684549b5882e'

* commit 'aac996cc01042194bf621d845bbe684549b5882e':
  g723_1: Rename files to better reflect their purpose

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/Makefile
index b88bbf64b57a9004a315d0ab955579a9f610f2ec,dfefab66f860516396129980a95ba45fc9fccee4..d8dfea12146044ae9c4bdb0a8181696293e5d323
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -276,10 -225,8 +276,10 @@@ OBJS-$(CONFIG_FOURXM_DECODER)          
  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
 +                                          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_GIF_DECODER)             += gifdec.o lzw.o
  OBJS-$(CONFIG_GIF_ENCODER)             += gif.o lzwenc.o
  OBJS-$(CONFIG_GSM_DECODER)             += gsmdec.o gsmdec_data.o msgsmdec.o

diff --cc libavcodec/g723_1.h
index 41ec341d6c0c90878555e6001573f5a0791b3241,71e2df4ad35c10fc077a6215b5cb647680d20fd3..718264f4c404701fbc957d1d6687e0a8bbf9c4dd
--- 1/libavcodec/g723_1_data.h
--- 2/libavcodec/g723_1.h
+++ b/libavcodec/g723_1.h
@@@ -22,11 -22,11 +22,11 @@@
  
  /**
   * @file
 - * G.723.1 compatible decoder data tables
 + * G723.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>
  

diff --cc libavcodec/g723_1dec.c
index 7cfad16409e6eed6b1b34e3d68f2cbbf8293fa94,dc05ed21211016d061f5403046f2a6f7c67c1491..9f071e878549a022b129b811729cf0a52b208b3c
--- 1/libavcodec/g723_1.c
--- 2/libavcodec/g723_1dec.c
+++ b/libavcodec/g723_1dec.c
@@@ -33,8 -33,7 +33,8 @@@
  #include "get_bits.h"
  #include "acelp_vectors.h"
  #include "celp_filters.h"
- #include "g723_1_data.h"
 +#include "celp_math.h"
+ #include "g723_1.h"
  #include "internal.h"
  
  #define CNG_RANDOM_SEED 12345