[asterisk-commits] russell: branch 1.4 r98082 - /branches/1.4/main/frame.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Jan 10 21:39:33 2008
New Revision: 98082

URL: http://svn.digium.com/view/asterisk?view=rev&rev=98082
Log:
Fix samples vs. length calculations for g722

Modified:
    branches/1.4/main/frame.c

Modified: branches/1.4/main/frame.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/frame.c?view=diff&rev=98082&r1=98081&r2=98082
==============================================================================
--- branches/1.4/main/frame.c (original)
+++ branches/1.4/main/frame.c Thu Jan 10 21:39:33 2008
@@ -1491,9 +1491,9 @@
 		break;
 	case AST_FORMAT_ULAW:
 	case AST_FORMAT_ALAW:
+		samples = f->datalen;
+		break;
 	case AST_FORMAT_G722:
-		samples = f->datalen;
-		break;
 	case AST_FORMAT_ADPCM:
 	case AST_FORMAT_G726:
 	case AST_FORMAT_G726_AAL2:
@@ -1527,6 +1527,7 @@
 	case AST_FORMAT_ALAW:
 		len = samples;
 		break;
+	case AST_FORMAT_G722:
 	case AST_FORMAT_ADPCM:
 	case AST_FORMAT_G726:
 	case AST_FORMAT_G726_AAL2: