[asterisk-commits] russell: branch 1.6.0 r110340 - in /branches/1.6.0: ./ codecs/codec_g722.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Mar 20 17:02:46 2008
New Revision: 110340

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110340
Log:
Merged revisions 110339 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r110339 | russell | 2008-03-20 17:02:20 -0500 (Thu, 20 Mar 2008) | 3 lines

Use the correct buffer for g722tolin16_sample.  This shouldn't have caused any
problems, but Qwell noticed the typo here.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/codecs/codec_g722.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/codecs/codec_g722.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/codecs/codec_g722.c?view=diff&rev=110340&r1=110339&r2=110340
==============================================================================
--- branches/1.6.0/codecs/codec_g722.c (original)
+++ branches/1.6.0/codecs/codec_g722.c Thu Mar 20 17:02:46 2008
@@ -151,10 +151,10 @@
 	static struct ast_frame f = {
 		.frametype = AST_FRAME_VOICE,
 		.subclass = AST_FORMAT_G722,
-		.datalen = sizeof(slin_g722_ex),
-		.samples = sizeof(slin_g722_ex) * 2,
+		.datalen = sizeof(g722_slin_ex),
+		.samples = sizeof(g722_slin_ex) * 2,
 		.src = __PRETTY_FUNCTION__,
-		.data = slin_g722_ex,
+		.data = g722_slin_ex,
 	};
 
 	return &f;