diff options
author | Liong Sauw Ming <ming@teluu.com> | 2012-06-18 05:59:08 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2012-06-18 05:59:08 +0000 |
commit | 7b37844d291e6ec6c33b94a6a7d8ad140b019864 (patch) | |
tree | 4e41ae888c1f17c5eccdd97e7af2173d9acdc4d6 /pjmedia | |
parent | 86710818f1c65192a78f05d1e2e5672c8802e55e (diff) |
Re #1536: Revert r4167
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4168 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r-- | pjmedia/include/pjmedia/vid_port.h | 13 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/vid_port.c | 3 |
2 files changed, 6 insertions, 10 deletions
diff --git a/pjmedia/include/pjmedia/vid_port.h b/pjmedia/include/pjmedia/vid_port.h index 0d5e3d84..96243549 100644 --- a/pjmedia/include/pjmedia/vid_port.h +++ b/pjmedia/include/pjmedia/vid_port.h @@ -78,23 +78,20 @@ typedef struct pjmedia_vid_port pjmedia_vid_port; PJ_DECL(void) pjmedia_vid_port_param_default(pjmedia_vid_port_param *prm); /** - * Create a video port with the specified parameter. Video port may open + * Create a video port with the specified parameter. When video port opens * the video stream with different parameter than the requested values in - * the \a prm.vidparam argument. Application can check the the values in - * the \a prm.vidparam argument to see if they have changed. + * the \a prm.vidparam argument, it will automatically do the necessary + * conversion. * * @param pool Pool to allocate memory from. - * @param prm On input, it specifies the video port parameters - * to be used. On output, prm.vidparam will be set to - * the actual video device parameters used to open the - * stream. + * @param prm The video port parameter. * @param p_vp Pointer to receive the result. * * @return PJ_SUCCESS if video port has been created * successfully, or the appropriate error code. */ PJ_DECL(pj_status_t) pjmedia_vid_port_create(pj_pool_t *pool, - pjmedia_vid_port_param *prm, + const pjmedia_vid_port_param *prm, pjmedia_vid_port **p_vp); /** diff --git a/pjmedia/src/pjmedia/vid_port.c b/pjmedia/src/pjmedia/vid_port.c index 304d2b02..6eee6a7c 100644 --- a/pjmedia/src/pjmedia/vid_port.c +++ b/pjmedia/src/pjmedia/vid_port.c @@ -184,7 +184,7 @@ static pj_status_t create_converter(pjmedia_vid_port *vp) } PJ_DEF(pj_status_t) pjmedia_vid_port_create( pj_pool_t *pool, - pjmedia_vid_port_param *prm, + const pjmedia_vid_port_param *prm, pjmedia_vid_port **p_vid_port) { pjmedia_vid_port *vp; @@ -365,7 +365,6 @@ PJ_DEF(pj_status_t) pjmedia_vid_port_create( pj_pool_t *pool, goto on_error; } - prm->vidparam = vparam; *p_vid_port = vp; return PJ_SUCCESS; |