From f5297544fc8dc20ff9dfeb03b048313081f004d7 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 4 Jun 2010 03:22:11 +0000 Subject: [PATCH] Merged revisions 267862,267877 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r267862 | tilghman | 2010-06-03 21:58:55 -0500 (Thu, 03 Jun 2010) | 5 lines As signed linear audio data is accessed as 16-bit values, certain processors require the values to be aligned in memory. (closes issue #16912) Reported by: michaelevdokimov ........ r267877 | tilghman | 2010-06-03 22:20:47 -0500 (Thu, 03 Jun 2010) | 8 lines As signed linear audio data is accessed as 16-bit values, certain processors require the values to be aligned in memory. (closes issue #16912) Reported by: michaelevdokimov Patches: asterisk.patch uploaded by michaelevdokimov (license 997) Tested by: michaelevdokimov ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@267883 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/slin.h | 78 ++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/include/asterisk/slin.h b/include/asterisk/slin.h index f8d57c9448..75c39af1a1 100644 --- a/include/asterisk/slin.h +++ b/include/asterisk/slin.h @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 2007, Digium, Inc. + * Copyright (C) 2010, Digium, Inc. * * Russell Bryant * @@ -16,46 +16,46 @@ * at the top of the source tree. */ -/* Source: beep.gsm +/* Source: beep.sln16 * Converted to beep.sln via file convert, then converted to hex: - * od -An -tx1 beep.sln | awk '{for (i=1; i