diff options
| author | Jason Parker <jparker@digium.com> | 2013-03-11 15:09:56 -0500 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:09:56 -0500 |
| commit | 483805f79570115ab95c69698792d238c1719b1b (patch) | |
| tree | 6b53ab2fd2b2478f864ccc8bd1b0bfaedc4d2050 /pjmedia/src/pjmedia-codec/audio_codecs.c | |
| parent | f3ab456a17af1c89a6e3be4d20c5944853df1cb0 (diff) | |
Import pjproject-2.1
Diffstat (limited to 'pjmedia/src/pjmedia-codec/audio_codecs.c')
| -rw-r--r-- | pjmedia/src/pjmedia-codec/audio_codecs.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia-codec/audio_codecs.c b/pjmedia/src/pjmedia-codec/audio_codecs.c index caf63e5..0c21821 100644 --- a/pjmedia/src/pjmedia-codec/audio_codecs.c +++ b/pjmedia/src/pjmedia-codec/audio_codecs.c @@ -1,4 +1,4 @@ -/* $Id: audio_codecs.c 3910 2011-12-15 06:34:25Z nanang $ */ +/* $Id: audio_codecs.c 4335 2013-01-29 08:09:15Z ming $ */ /* * Copyright (C) 2011-2011 Teluu Inc. (http://www.teluu.com) * @@ -107,9 +107,16 @@ pjmedia_codec_register_audio_codecs(pjmedia_endpt *endpt, return status; #endif /* PJMEDIA_HAS_L16_CODEC */ -#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC - /* Register OpenCORE AMR-NB */ - status = pjmedia_codec_opencore_amrnb_init(endpt); +#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC || PJMEDIA_HAS_OPENCORE_AMRWB_CODEC + /* Register OpenCORE AMR */ + status = pjmedia_codec_opencore_amr_init(endpt, 0); + if (status != PJ_SUCCESS) + return status; +#endif + +#if PJMEDIA_HAS_SILK_CODEC + /* Register SILK */ + status = pjmedia_codec_silk_init(endpt); if (status != PJ_SUCCESS) return status; #endif |