diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-03-16 14:24:26 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-03-16 14:24:26 +0000 |
| commit | c0598144d962fbc8c20482bdc5e00e99ec62f8a9 (patch) | |
| tree | c7891e82c998f549f375c6a72da822ff5a4fe9db /pjmedia/include/pjmedia-codec | |
| parent | 91329274db688fbb43ce0dc80f9174cc82489a48 (diff) | |
Added misc flags and modify Makefiles to allow exclusion of PortAudio and specific codec during compilation
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@320 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/include/pjmedia-codec')
| -rw-r--r-- | pjmedia/include/pjmedia-codec/config.h | 16 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-codec/types.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h index 9b93c5a1..a9cdbfaf 100644 --- a/pjmedia/include/pjmedia-codec/config.h +++ b/pjmedia/include/pjmedia-codec/config.h @@ -22,19 +22,19 @@ #include <pjmedia/types.h> -/* - * Include GSM codec? +/** + * Unless specified otherwise, GSM codec is included by default. */ -#ifndef PJMEDIA_CODEC_HAS_GSM -# define PJMEDIA_CODEC_HAS_GSM 1 +#ifndef PJMEDIA_HAS_GSM_CODEC +# define PJMEDIA_HAS_GSM_CODEC 1 #endif -/* - * Include Speex codec? +/** + * Unless specified otherwise, Speex codec is included by default. */ -#ifndef PJMEDIA_CODEC_HAS_SPEEX -# define PJMEDIA_CODEC_HAS_SPEEX 1 +#ifndef PJMEDIA_HAS_SPEEX_CODEC +# define PJMEDIA_HAS_SPEEX_CODEC 1 #endif diff --git a/pjmedia/include/pjmedia-codec/types.h b/pjmedia/include/pjmedia-codec/types.h index ce5c258c..af847543 100644 --- a/pjmedia/include/pjmedia-codec/types.h +++ b/pjmedia/include/pjmedia-codec/types.h @@ -19,7 +19,7 @@ #ifndef __PJMEDIA_CODEC_TYPES_H__ #define __PJMEDIA_CODEC_TYPES_H__ -#include <pjmedia/types.h> +#include <pjmedia-codec/config.h> #endif /* __PJMEDIA_CODEC_TYPES_H__ */ |