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
18 years ago · f826e84059
parent 97ac0d3d1c
commit f826e84059
1 changed files with 2 additions and 1 deletions
--- 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: