From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 11 Jan 2008 03:39:33 +0000 (+0000)
Subject: Fix samples vs. length calculations for g722
X-Git-Tag: 1.4.18~12^2~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f826e84059d65eeaabf1b46c0841725f82b52bca;p=thirdparty%2Fasterisk.git

Fix samples vs. length calculations for g722


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

diff --git a/main/frame.c b/main/frame.c
index 0cd0b03fb2..d6400a9afc 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -1491,9 +1491,9 @@ int ast_codec_get_samples(struct ast_frame *f)
 		break;
 	case AST_FORMAT_ULAW:
 	case AST_FORMAT_ALAW:
-	case AST_FORMAT_G722:
 		samples = f->datalen;
 		break;
+	case AST_FORMAT_G722:
 	case AST_FORMAT_ADPCM:
 	case AST_FORMAT_G726:
 	case AST_FORMAT_G726_AAL2:
@@ -1527,6 +1527,7 @@ int ast_codec_get_len(int format, int samples)
 	case AST_FORMAT_ALAW:
 		len = samples;
 		break;
+	case AST_FORMAT_G722:
 	case AST_FORMAT_ADPCM:
 	case AST_FORMAT_G726:
 	case AST_FORMAT_G726_AAL2: