master
MelwareDE 11 years ago
parent a195a39a55
commit 011b8e71f9
  1. 2
      chan_capi.c
  2. 8
      chan_capi_rtp.c

@ -8455,8 +8455,6 @@ static int conf_interface(struct cc_capi_conf *conf, struct ast_variable *v)
char *p, *q;
#ifdef CC_AST_HAS_VERSION_10_0
struct ast_format_cap *cap = ast_format_cap_alloc ();
#else
const void* cap = 0;
#endif
memset(faxdest, 0, sizeof(faxdest));

@ -362,12 +362,12 @@ struct ast_frame *capi_read_rtp(struct capi_pvt *i, unsigned char *buf, int len)
return NULL;
}
cc_verbose(6, 1, VERBOSE_PREFIX_4 "%s: DATA_B3_IND RTP NCCI=%#x len=%d %s (read/write=%d/%d)\n",
i->vname, i->NCCI, len, ast_getformatname(FRAME_SUBCLASS_CODEC(f->subclass)),
i->vname, i->NCCI, len, cc_getformatname(GET_FRAME_SUBCLASS_CODEC(f->subclass)),
i->owner->readformat, i->owner->writeformat);
if (i->owner->nativeformats != FRAME_SUBCLASS_CODEC(f->subclass)) {
if (i->owner->nativeformats != GET_FRAME_SUBCLASS_CODEC(f->subclass)) {
cc_verbose(3, 1, VERBOSE_PREFIX_3 "%s: DATA_B3_IND RTP nativeformats=%d, but subclass=%ld\n",
i->vname, i->owner->nativeformats, FRAME_SUBCLASS_CODEC(f->subclass));
i->owner->nativeformats = FRAME_SUBCLASS_CODEC(f->subclass);
i->vname, i->owner->nativeformats, GET_FRAME_SUBCLASS_CODEC(f->subclass));
i->owner->nativeformats = GET_FRAME_SUBCLASS_CODEC(f->subclass);
ast_set_read_format(i->owner, i->owner->readformat);
ast_set_write_format(i->owner, i->owner->writeformat);
}

Loading…
Cancel
Save