From: Mark Spencer <markster@digium.com>
Date: Mon, 19 Jul 2004 15:52:57 +0000 (+0000)
Subject: Merge mic's minor patchlet (bug #2092)
X-Git-Tag: 1.0.0-rc2~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed42d3074de60387c22e7f07da47a262e9e736a2;p=thirdparty%2Fasterisk.git

Merge mic's minor patchlet (bug #2092)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index c9b3bf93f0..bfd3b25a52 100755
--- a/Makefile
+++ b/Makefile
@@ -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 43c4e13dba..82d8f458e0 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
diff --git a/frame.c b/frame.c
index c93d2abff3..72197d5c15 100755
--- a/frame.c
+++ b/frame.c
@@ -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;