diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-19 15:52:57 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-19 15:52:57 +0000 |
commit | 6dbcbe8b1ef7fecd79510b3d2c0894792f941a11 (patch) | |
tree | 55c91d4a99cb56b2dc87e859ee262873461fae30 | |
parent | 1bda78c0c9708eea2261288848292c3c434a3b23 (diff) |
Merge mic's minor patchlet (bug #2092)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3478 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | Makefile | 1 | ||||
-rwxr-xr-x | codecs/Makefile | 2 | ||||
-rwxr-xr-x | frame.c | 3 |
3 files changed, 6 insertions, 0 deletions
@@ -372,6 +372,7 @@ bininstall: all mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax + mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8 diff --git a/codecs/Makefile b/codecs/Makefile index 43c4e13db..82d8f458e 100755 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -86,7 +86,9 @@ codec_lpc10.so: codec_lpc10.o $(LIBLPC10) %.so : %.o $(CC) $(SOLINK) -o $@ $< +ifneq ($(wildcard .depend),) include .depend +endif install: all for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done @@ -136,6 +136,9 @@ struct ast_frame *ast_smoother_read(struct ast_smoother *s) int len; /* IF we have an optimization frame, send it */ 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; s->opt = NULL; return opt; |