kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge mic's minor patchlet (bug #2092)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-07-19 15:52:57 +00:00
parent eb80683222
commit ed42d3074d
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -372,6 +372,7 @@ bininstall: all
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8 install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8

2
codecs/Makefile
View File

@@ -86,7 +86,9 @@ codec_lpc10.so: codec_lpc10.o $(LIBLPC10)
%.so : %.o %.so : %.o
$(CC) $(SOLINK) -o $@ $< $(CC) $(SOLINK) -o $@ $<
ifneq ($(wildcard .depend),)
include .depend include .depend
endif
install: all install: all
for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done

3
frame.c
View File

@@ -136,6 +136,9 @@ struct ast_frame *ast_smoother_read(struct ast_smoother *s)
int len; int len;
/* IF we have an optimization frame, send it */ /* IF we have an optimization frame, send it */
if (s->opt) { if (s->opt) {
if (s->opt->offset < AST_FRIENDLY_OFFSET)
ast_log(LOG_WARNING, "Returning a frame of inappropriate offset (%d).",
s->opt->offset);
opt = s->opt; opt = s->opt;
s->opt = NULL; s->opt = NULL;
return opt; return opt;