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 c9b3bf93f0b5500b93667d6eaae83fbb1641d57d..bfd3b25a520ac2e365e1813322fdd8ae4d617e78 100755 (executable)
--- 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 43c4e13dba59acce02c14545b91a061ca3cf9092..82d8f458e09ec2c8bd9412e92a671c248bf480bd 100755 (executable)
--- 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 c93d2abff3b9daa0daa4ec3ac16314cac19bfdd8..72197d5c154f93ecb194e98d964a49aa6371bd90 100755 (executable)
--- 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;