diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-05-14 11:04:46 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-05-14 11:04:46 +0000 |
| commit | 200f391a5150910e39b10e9a251b5e3fb2374b6e (patch) | |
| tree | 5869b6c0161dbe8223de3d7c51219c915be06b7b /pjmedia | |
| parent | 08ec20ea344b8f308cbd5fb322e55ab2a2996300 (diff) | |
Re #1509: backported r4112-4121
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4122 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/conf_switch.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/wav_player.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia/conf_switch.c b/pjmedia/src/pjmedia/conf_switch.c index 269405da..85a884c5 100644 --- a/pjmedia/src/pjmedia/conf_switch.c +++ b/pjmedia/src/pjmedia/conf_switch.c @@ -546,7 +546,7 @@ PJ_DEF(pj_status_t) pjmedia_conf_connect_port( pjmedia_conf *conf, /* Channel count must match. */ if (src_afd->channel_count != dst_afd->channel_count) { pj_mutex_unlock(conf->mutex); - return PJMEDIA_ENCCLOCKRATE; + return PJMEDIA_ENCCHANNEL; } /* Source and sink ptime must be equal or a multiplication factor. */ diff --git a/pjmedia/src/pjmedia/wav_player.c b/pjmedia/src/pjmedia/wav_player.c index a089ee16..e7084f86 100644 --- a/pjmedia/src/pjmedia/wav_player.c +++ b/pjmedia/src/pjmedia/wav_player.c @@ -157,6 +157,7 @@ static pj_status_t fill_buffer(struct file_reader_port *fport) int val = pjmedia_linear2alaw(0); pj_memset(fport->eofpos, val, size_left); } + size_left = 0; } /* Rewind file */ |