[svn-commits] kpfleming: branch 1.4 r3347 - in /branches/1.4: ./ wctc4xxp/base.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Fri Dec  7 16:13:20 2007
New Revision: 3347

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3347
Log:
Merged revisions 3346 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3346 | kpfleming | 2007-12-07 16:12:46 -0600 (Fri, 07 Dec 2007) | 2 lines

revert a change that caused some problems and wasn't necessary

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/wctc4xxp/base.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctc4xxp/base.c?view=diff&rev=3347&r1=3346&r2=3347
==============================================================================
--- branches/1.4/wctc4xxp/base.c (original)
+++ branches/1.4/wctc4xxp/base.c Fri Dec  7 16:13:20 2007
@@ -1100,7 +1100,7 @@
 					chars[i] = readchunk[i+54];
 
 				zth->dstlen += rlen;
-				zth->dstsamples += G729_SAMPLES;
+				zth->dstsamples = zth->dstlen * 8;
 
 			} else {
 				ztc->errorstatus = -EOVERFLOW;