Version 0.1.4 from FTP

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

2 files changed, 5 insertions, 2 deletions

diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index 90ee6f3b6..a582bec12 100755
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -8,7 +8,9 @@
  * Mark Spencer <markster@linux-support.net>
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU Lesser General Public License.  Other components of
+ * Asterisk are distributed under The GNU General Public License
+ * only.
  */
 
 #ifndef _ASTERISK_FRAME_H
@@ -56,6 +58,7 @@ struct ast_frame_chain {
 #define AST_FRAME_NULL		5		/* An empty, useless frame */
 #define AST_FRAME_IAX		6		/* Inter Aterisk Exchange private frame type */
 #define AST_FRAME_TEXT		7		/* Text messages */
+#define AST_FRAME_IMAGE		8		/* Image Frames */
 
 /* Data formats for capabilities and frames alike */
 #define AST_FORMAT_G723_1	(1 << 0)	/* G.723.1 compression */
diff --git a/logger.c b/logger.c
index 179ab66f3..d2117c979 100755
--- a/logger.c
+++ b/logger.c
@@ -89,7 +89,7 @@ extern void ast_log(int level, char *file, int line, char *function, char *fmt,
 		} else
 			ast_log(LOG_WARNING, "Unable to retrieve local time?\n");
 	} else {
-		fprintf(stdout, "%s: File %s, Line %d (%s): ", levels[level], file, line, function);
+		fprintf(stdout, "%s[%ld]: File %s, Line %d (%s): ", levels[level], pthread_self(), file, line, function);
 		vfprintf(stdout, fmt, ap);
 		fflush(stdout);
 	}