aboutsummaryrefslogtreecommitdiffstats
path: root/main/frame.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-11 03:39:33 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-11 03:39:33 +0000
commit83a7a217a2600f21b23c1cf8ba4f0858222cbccc (patch)
tree4adf8d8f2be5f0ab48415bac2b9ffc99653011c2 /main/frame.c
parent9005a1169b0918fce0b6c2a93d45b617f06c82bb (diff)
Fix samples vs. length calculations for g722
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@98082 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/frame.c')
-rw-r--r--main/frame.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/frame.c b/main/frame.c
index 0cd0b03fb..d6400a9af 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: