From 4be03d2e4f640b91d918d08ffb7f863b70ee40b9 Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Fri, 13 Apr 2012 06:24:23 +0000 Subject: 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 --- pjmedia/include/pjmedia-codec/config.h | 6 +- pjmedia/include/pjmedia-codec/ffmpeg_codecs.h | 67 ----------------------- pjmedia/include/pjmedia-codec/ffmpeg_vid_codecs.h | 67 +++++++++++++++++++++++ 3 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 pjmedia/include/pjmedia-codec/ffmpeg_codecs.h create mode 100644 pjmedia/include/pjmedia-codec/ffmpeg_vid_codecs.h (limited to 'pjmedia/include/pjmedia-codec') 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_codecs.h deleted file mode 100644 index b089cbc1..00000000 --- a/pjmedia/include/pjmedia-codec/ffmpeg_codecs.h +++ /dev/null @@ -1,67 +0,0 @@ -/* $Id$ */ -/* - * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2003-2008 Benny Prijono - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * 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__ - - -#include -#include - -PJ_BEGIN_DECL - -/** - * @defgroup PJMEDIA_CODEC_VID_FFMPEG FFmpeg Codecs - * @ingroup PJMEDIA_CODEC_VID_CODECS - * @{ - */ - -/** - * Initialize and register FFMPEG 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 - * (in that case, an instance of video codec manager must - * have been created beforehand). - * @param pf Pool factory. - * - * @return PJ_SUCCESS on success. - */ -PJ_DECL(pj_status_t) pjmedia_codec_ffmpeg_init(pjmedia_vid_codec_mgr *mgr, - pj_pool_factory *pf); - - -/** - * Unregister FFMPEG 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_END_DECL - - -/** - * @} - */ - -#endif /* __PJMEDIA_CODECS_FFMPEG_H__ */ - diff --git a/pjmedia/include/pjmedia-codec/ffmpeg_vid_codecs.h b/pjmedia/include/pjmedia-codec/ffmpeg_vid_codecs.h new file mode 100644 index 00000000..b27da310 --- /dev/null +++ b/pjmedia/include/pjmedia-codec/ffmpeg_vid_codecs.h @@ -0,0 +1,67 @@ +/* $Id$ */ +/* + * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * 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_VID_H__ +#define __PJMEDIA_CODECS_FFMPEG_VID_H__ + + +#include +#include + +PJ_BEGIN_DECL + +/** + * @defgroup PJMEDIA_CODEC_VID_FFMPEG FFmpeg Codecs + * @ingroup PJMEDIA_CODEC_VID_CODECS + * @{ + */ + +/** + * 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 + * (in that case, an instance of video codec manager must + * have been created beforehand). + * @param pf Pool factory. + * + * @return PJ_SUCCESS on success. + */ +PJ_DECL(pj_status_t) pjmedia_codec_ffmpeg_vid_init(pjmedia_vid_codec_mgr *mgr, + pj_pool_factory *pf); + + +/** + * 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_vid_deinit(void); + + +PJ_END_DECL + + +/** + * @} + */ + +#endif /* __PJMEDIA_CODECS_FFMPEG_VID_H__ */ + -- cgit v1.2.3