diff options
| -rw-r--r-- | pjmedia/build/Makefile | 3 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/sdp.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 54a4f59e..73c1e19a 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -65,9 +65,10 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ export PJMEDIA_SRCDIR = ../src/pjmedia export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ codec.o conference.o endpoint.o errno.o file_player.o \ + file_writer.o \ g711.o jbuf.o null_port.o port.o resample.o resample_port.o \ rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \ - sound_port.o stream.o $(SOUND_OBJS) $(NULLSOUND_OBJS) + sound_port.o stream.o wave.o $(SOUND_OBJS) $(NULLSOUND_OBJS) export PJMEDIA_CFLAGS += $(_CFLAGS) diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c index fd72f668..6a677b6c 100644 --- a/pjmedia/src/pjmedia/sdp.c +++ b/pjmedia/src/pjmedia/sdp.c @@ -299,10 +299,10 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtpmap( const pjmedia_sdp_attr *attr, rtpmap->clock_rate = pj_strtoul(&token); /* Expecting either '/' or EOF */ - if (*p != '/' && p != end) + if (p != end && *p != '/') return PJMEDIA_SDP_EINRTPMAP; - if (*p == '/') { + if (p != end) { ++p; token.ptr = (char*)p; token.slen = end-p; |