diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2012-04-13 06:24:23 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2012-04-13 06:24:23 +0000 |
| commit | 4be03d2e4f640b91d918d08ffb7f863b70ee40b9 (patch) | |
| tree | 21c5bccbf57857d9e7bb3c896d3d212b33fcf5f4 /pjmedia/include | |
| parent | afc721810fb9b6a2bc9f9af34132ffc96078669a (diff) | |
Re #1446 (misc): Modified ffmpeg_codecs to ffmpeg_vid_codecs
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4049 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/include')
| -rw-r--r-- | pjmedia/include/pjmedia-codec.h | 2 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-codec/config.h | 6 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-codec/ffmpeg_vid_codecs.h (renamed from pjmedia/include/pjmedia-codec/ffmpeg_codecs.h) | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/pjmedia/include/pjmedia-codec.h b/pjmedia/include/pjmedia-codec.h index 9eba4c11..48f7c8db 100644 --- a/pjmedia/include/pjmedia-codec.h +++ b/pjmedia/include/pjmedia-codec.h @@ -27,7 +27,7 @@ #include <pjmedia-codec/audio_codecs.h> #include <pjmedia-codec/l16.h> -#include <pjmedia-codec/ffmpeg_codecs.h> +#include <pjmedia-codec/ffmpeg_vid_codecs.h> #include <pjmedia-codec/gsm.h> #include <pjmedia-codec/speex.h> #include <pjmedia-codec/ilbc.h> diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h index 0f94a98c..07f92fbc 100644 --- a/pjmedia/include/pjmedia-codec/config.h +++ b/pjmedia/include/pjmedia-codec/config.h @@ -378,12 +378,12 @@ /** - * Specify if FFMPEG codecs are available. + * Specify if FFMPEG video codecs are available. * * Default: PJMEDIA_HAS_LIBAVCODEC */ -#ifndef PJMEDIA_HAS_FFMPEG_CODEC -# define PJMEDIA_HAS_FFMPEG_CODEC PJMEDIA_HAS_LIBAVCODEC +#ifndef PJMEDIA_HAS_FFMPEG_VID_CODEC +# define PJMEDIA_HAS_FFMPEG_VID_CODEC PJMEDIA_HAS_LIBAVCODEC #endif /** diff --git a/pjmedia/include/pjmedia-codec/ffmpeg_codecs.h b/pjmedia/include/pjmedia-codec/ffmpeg_vid_codecs.h index b089cbc1..b27da310 100644 --- a/pjmedia/include/pjmedia-codec/ffmpeg_codecs.h +++ b/pjmedia/include/pjmedia-codec/ffmpeg_vid_codecs.h @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __PJMEDIA_CODECS_FFMPEG_H__ -#define __PJMEDIA_CODECS_FFMPEG_H__ +#ifndef __PJMEDIA_CODECS_FFMPEG_VID_H__ +#define __PJMEDIA_CODECS_FFMPEG_VID_H__ #include <pjmedia-codec/types.h> @@ -33,7 +33,7 @@ PJ_BEGIN_DECL */ /** - * Initialize and register FFMPEG codecs factory to pjmedia endpoint. + * Initialize and register FFMPEG video codecs factory to pjmedia endpoint. * * @param mgr The video codec manager instance where this codec will * be registered to. Specify NULL to use default instance @@ -43,17 +43,17 @@ PJ_BEGIN_DECL * * @return PJ_SUCCESS on success. */ -PJ_DECL(pj_status_t) pjmedia_codec_ffmpeg_init(pjmedia_vid_codec_mgr *mgr, - pj_pool_factory *pf); +PJ_DECL(pj_status_t) pjmedia_codec_ffmpeg_vid_init(pjmedia_vid_codec_mgr *mgr, + pj_pool_factory *pf); /** - * Unregister FFMPEG codecs factory from the video codec manager and + * Unregister FFMPEG video codecs factory from the video codec manager and * deinitialize the codecs library. * * @return PJ_SUCCESS on success. */ -PJ_DECL(pj_status_t) pjmedia_codec_ffmpeg_deinit(void); +PJ_DECL(pj_status_t) pjmedia_codec_ffmpeg_vid_deinit(void); PJ_END_DECL @@ -63,5 +63,5 @@ PJ_END_DECL * @} */ -#endif /* __PJMEDIA_CODECS_FFMPEG_H__ */ +#endif /* __PJMEDIA_CODECS_FFMPEG_VID_H__ */ |