diff options
| author | Vladimir Voroshilov <voroshil@gmail.com> | 2008-09-03 15:39:41 +0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 21:11:00 +0200 |
| commit | bfbfe56f944960ecf2599e9d3ca9340bf867543a (patch) | |
| tree | c47dbda03a47b7de227bb007c1b491c0af3aaff1 /libavcodec | |
| parent | ce7c954800681ed789e44fc6bbd25205c41da9d1 (diff) | |
| download | ffmpeg-bfbfe56f944960ecf2599e9d3ca9340bf867543a.tar.gz | |
G.729 build environment
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3503f4b48c..0c6402320b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -159,6 +159,7 @@ OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o OBJS-$(CONFIG_FRWU_DECODER) += frwu.o +OBJS-$(CONFIG_G729_DECODER) += g729dec.o lsp.o celp_math.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.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 --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index fb6094291c..0115240d66 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -258,6 +258,7 @@ void avcodec_register_all(void) REGISTER_DECODER (DSICINAUDIO, dsicinaudio); REGISTER_ENCDEC (EAC3, eac3); REGISTER_ENCDEC (FLAC, flac); + REGISTER_DECODER (G729, g729); REGISTER_DECODER (GSM, gsm); REGISTER_DECODER (GSM_MS, gsm_ms); REGISTER_DECODER (IMC, imc); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8e89e997d0..e04513a29a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -344,6 +344,7 @@ enum CodecID { CODEC_ID_AAC_LATM, CODEC_ID_QDMC, CODEC_ID_CELT, + CODEC_ID_G729 = 0x15800, /* subtitle codecs */ CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. |