diff options
author | Benny Prijono <bennylp@teluu.com> | 2009-03-17 17:35:27 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2009-03-17 17:35:27 +0000 |
commit | 8c89283f8ee5849c310fb898c449e79b4388c5e3 (patch) | |
tree | 4111e83aec3ae6a14513056c40f3423f35a6f65a /pjmedia | |
parent | d24babc20fc948427c18132fcf68f88e8943e723 (diff) |
Part of APS-Direct (ticket #738): crash in stream.c when stream_info->param is NULL
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2520 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r-- | pjmedia/src/pjmedia/stream.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c index 1e289e98..ffbd2cb2 100644 --- a/pjmedia/src/pjmedia/stream.c +++ b/pjmedia/src/pjmedia/stream.c @@ -1597,12 +1597,14 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt, pj_strdup(pool, &stream->port.info.encoding_name, &info->fmt.encoding_name); stream->port.info.clock_rate = info->fmt.clock_rate; stream->port.info.channel_count = info->fmt.channel_cnt; - stream->port.info.format.id = info->param->info.fmt_id; stream->port.port_data.pdata = stream; - if (stream->port.info.format.id == PJMEDIA_FORMAT_L16) { + if (info->param==NULL || info->param->info.fmt_id == PJMEDIA_FORMAT_L16) { + stream->port.info.format.id = PJMEDIA_FORMAT_L16; + stream->port.put_frame = &put_frame; stream->port.get_frame = &get_frame; } else { + stream->port.info.format.id = info->param->info.fmt_id; stream->port.info.format.bitrate = info->param->info.avg_bps; stream->port.info.format.vad = (info->param->setting.vad != 0); |