Skip to content
Snippets Groups Projects
Commit ed42d307 authored by Mark Spencer's avatar Mark Spencer
Browse files

Merge mic's minor patchlet (bug #2092)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent eb806832
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment