git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From Chris Maynard:
[obnox/wireshark/wip.git]
/
g711.c
diff --git
a/g711.c
b/g711.c
index 7fddaed43a613b2119febae5d55b12048b1a52be..5ae74148ba150b7ad25cf044a7d39076115ab4df 100644
(file)
--- a/
g711.c
+++ b/
g711.c
@@
-26,6
+26,8
@@
* Mountain View, California 94043
*/
* Mountain View, California 94043
*/
+#include "g711.h"
+
/*
* g711.c
*
/*
* g711.c
*
@@
-265,21
+267,23
@@
ulaw2linear(
}
/* A-law to u-law conversion */
}
/* A-law to u-law conversion */
-unsigned char
-alaw2ulaw(
- unsigned char aval)
-{
- aval &= 0xff;
- return ((aval & 0x80) ? (0xFF ^ _a2u[aval ^ 0xD5]) :
- (0x7F ^ _a2u[aval ^ 0x55]));
-}
+/* unsigned char
+ * alaw2ulaw(
+ * unsigned char aval)
+ * {
+ * aval &= 0xff;
+ * return ((aval & 0x80) ? (0xFF ^ _a2u[aval ^ 0xD5]) :
+ * (0x7F ^ _a2u[aval ^ 0x55]));
+ * }
+ */
/* u-law to A-law conversion */
/* u-law to A-law conversion */
-unsigned char
-ulaw2alaw(
- unsigned char uval)
-{
- uval &= 0xff;
- return ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) :
- (0x55 ^ (_u2a[0x7F ^ uval] - 1)));
-}
+/* unsigned char
+ * ulaw2alaw(
+ * unsigned char uval)
+ * {
+ * uval &= 0xff;
+ * return ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) :
+ * (0x55 ^ (_u2a[0x7F ^ uval] - 1)));
+ * }
+ */