diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 03:42:28 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 03:42:28 +0000 |
| commit | cd283c8825c9a94400f27735acb1c9385e90ffc8 (patch) | |
| tree | 56d5722310fa8957ce5d1ba7cbd137cf8802dcc7 /pjmedia/include/pjmedia-codec/config.h | |
| parent | ed8f8d08abba9040f769e922aa0c1adbde86fbbc (diff) | |
Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3664 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/include/pjmedia-codec/config.h')
| -rw-r--r-- | pjmedia/include/pjmedia-codec/config.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h index 693fb106..fb02d47a 100644 --- a/pjmedia/include/pjmedia-codec/config.h +++ b/pjmedia/include/pjmedia-codec/config.h @@ -34,7 +34,6 @@ #include <pjmedia/types.h> - /* * Include config_auto.h if autoconf is used (PJ_AUTOCONF is set) */ @@ -42,6 +41,7 @@ # include <pjmedia-codec/config_auto.h> #endif + /** * Unless specified otherwise, L16 codec is included by default. */ @@ -343,8 +343,20 @@ to control which implementation to be used. #endif + +/** + * Specify if FFMPEG codecs are available. + * + * Default: PJMEDIA_HAS_LIBAVCODEC + */ +#ifndef PJMEDIA_HAS_FFMPEG_CODEC +# define PJMEDIA_HAS_FFMPEG_CODEC PJMEDIA_HAS_LIBAVCODEC +#endif + /** * @} */ + + #endif /* __PJMEDIA_CODEC_CONFIG_H__ */ |