diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-07 15:04:13 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-07 15:04:13 +0100 |
| commit | 9cf74191eda3ee6e2bf385a4c230ce5e84e72256 (patch) | |
| tree | 50583cd9943d38ae2518c93eb27b3c1f9890e6d6 /libavcodec/Makefile | |
| parent | dc97ff8380c2d35aebdd073bcd727084c5037c3c (diff) | |
| parent | aac996cc01042194bf621d845bbe684549b5882e (diff) | |
| download | ffmpeg-9cf74191eda3ee6e2bf385a4c230ce5e84e72256.tar.gz | |
Merge commit 'aac996cc01042194bf621d845bbe684549b5882e'
* commit 'aac996cc01042194bf621d845bbe684549b5882e':
g723_1: Rename files to better reflect their purpose
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b88bbf64b5..d8dfea1214 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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 |