virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'aac996cc01042194bf621d845bbe684549b5882e'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-12-07 15:04:13 +01:00
commit 9cf74191ed
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/Makefile
View File

@ -276,9 +276,9 @@ 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 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

6
libavcodec/g723_1_data.h → libavcodec/g723_1.h
View File

@ -25,8 +25,8 @@
* 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>
@ -1324,4 +1324,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 */

2
libavcodec/g723_1.c → libavcodec/g723_1dec.c
View File

@ -34,7 +34,7 @@
#include "acelp_vectors.h"
#include "celp_filters.h"
#include "celp_math.h"
#include "g723_1_data.h"
#include "g723_1.h"
#include "internal.h"
#define CNG_RANDOM_SEED 12345