aboutsummaryrefslogtreecommitdiffstats
path: root/main/translate.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-06 00:14:32 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-06 00:14:32 +0000
commitf9f33f16fbad3c7f228791cb1f4e38b4d73ced73 (patch)
tree629fd8245dca6f6351b5dcf9560420dfb221655e /main/translate.c
parentc7864bc14b10cc91805378e278f007019dfc7187 (diff)
Merged revisions 105840 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r105840 | tilghman | 2008-03-04 17:04:29 -0600 (Tue, 04 Mar 2008) | 2 lines Whitespace changes only ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106306 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/translate.c')
-rw-r--r--main/translate.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/translate.c b/main/translate.c
index ace245424..83a93a4d2 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -202,7 +202,7 @@ static int framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
if (pvt->samples == samples)
ast_log(LOG_WARNING, "%s did not update samples %d\n",
pvt->t->name, pvt->samples);
- return ret;
+ return ret;
}
/*! \brief generic frameout routine.
@@ -654,10 +654,10 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
}
if (t->buf_size) {
- /*
- * Align buf_size properly, rounding up to the machine-specific
- * alignment for pointers.
- */
+ /*
+ * Align buf_size properly, rounding up to the machine-specific
+ * alignment for pointers.
+ */
struct _test_align { void *a, *b; } p;
int align = (char *)&p.b - (char *)&p.a;