diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-06-20 15:39:07 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-06-20 15:39:07 +0000 |
| commit | e03158426d316085bbec3088f3a54004dc832a0e (patch) | |
| tree | bf745f7af641d801e7bc9cd8857da6d63ab22cd1 /pjmedia/src/pjmedia/conference.c | |
| parent | e120cd2fd516294025fb23da7403ceac296e2411 (diff) | |
Yet again large diffs because of documentation/doxygen update
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@531 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia/conference.c')
| -rw-r--r-- | pjmedia/src/pjmedia/conference.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c index abf522b1..7c4ed922 100644 --- a/pjmedia/src/pjmedia/conference.c +++ b/pjmedia/src/pjmedia/conference.c @@ -1055,7 +1055,7 @@ static pj_status_t read_port( pjmedia_conf *conf, (int)cport->name.slen, cport->name.ptr, count)); - status = (cport->port->get_frame)(cport->port, &f); + status = pjmedia_port_get_frame(cport->port, &f); *type = f.type; @@ -1460,6 +1460,10 @@ static pj_status_t get_frame(pjmedia_port *this_port, */ continue; } + + /* Check that the port is not removed when we call get_frame() */ + if (conf->ports[i] == NULL) + continue; } /* If we need to adjust the RX level from this port, adjust the level |