diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-07 15:50:45 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-07 15:50:45 +0100 |
| commit | 90c93fb12948f0b00720df91961a09e187703060 (patch) | |
| tree | 6da306f52459e1178c7d75c058b0389b49db6d89 /libavcodec/Makefile | |
| parent | 6c9cc21bcca952ca86a6cf08376afa9f3b7a2034 (diff) | |
| parent | f023d57d355ff3b917f1aad9b03db5c293ec4244 (diff) | |
| download | ffmpeg-streaming-90c93fb12948f0b00720df91961a09e187703060.zip ffmpeg-streaming-90c93fb12948f0b00720df91961a09e187703060.tar.gz | |
Merge commit 'f023d57d355ff3b917f1aad9b03db5c293ec4244'
* commit 'f023d57d355ff3b917f1aad9b03db5c293ec4244':
lavc: G.723.1 encoder
Split existing FFmpeg G.723.1 encoder into a new file.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4b95e16..1ad3787 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -276,9 +276,10 @@ 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_1dec.o g723_1.o acelp_vectors.o \ - celp_filters.o celp_math.o -OBJS-$(CONFIG_G723_1_ENCODER) += g723_1dec.o g723_1.o acelp_vectors.o celp_math.o +OBJS-$(CONFIG_G723_1_DECODER) += g723_1dec.o g723_1.o \ + acelp_vectors.o celp_filters.o celp_math.o +OBJS-$(CONFIG_G723_1_ENCODER) += g723_1enc.o g723_1.o \ + acelp_vectors.o celp_filters.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 |
