summaryrefslogtreecommitdiff
path: root/codecs/lpc10/voicin.c
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-06-26 03:50:14 +0000
committerMark Spencer <markster@digium.com>2004-06-26 03:50:14 +0000
commit3db853b4281290ee06963dd01cf27009710110dd (patch)
treefeff9533d65b873c284ba444827e32141d0ec6a7 /codecs/lpc10/voicin.c
parenta30ae193db2a8c81c186bcfff759fba29bf89a6b (diff)
Merge source cleanups (bug #1911)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs/lpc10/voicin.c')
-rwxr-xr-xcodecs/lpc10/voicin.c29
1 files changed, 19 insertions, 10 deletions
diff --git a/codecs/lpc10/voicin.c b/codecs/lpc10/voicin.c
index 0b87d18c1..45bb5d0d3 100755
--- a/codecs/lpc10/voicin.c
+++ b/codecs/lpc10/voicin.c
@@ -1,6 +1,9 @@
/*
$Log$
+Revision 1.16 2004/06/26 03:50:14 markster
+Merge source cleanups (bug #1911)
+
Revision 1.15 2003/11/23 22:14:32 markster
Various warning cleanups
@@ -27,12 +30,6 @@ Some OSS fixes and a few lpc changes to make it actually work
*/
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: vparms_ 14 14 4 6 6 4 4 6 4 4 4 4 6 6 6 6 */
-#endif
-
/* -- translated by f2c (version 19951025).
You must link the resulting object file with the libraries:
-lf2c -lm (in that order)
@@ -40,6 +37,12 @@ extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, int
#include "f2c.h"
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st);
+/* comlen contrl_ 12 */
+/*:ref: vparms_ 14 14 4 6 6 4 4 6 4 4 4 4 6 6 6 6 */
+#endif
+
/* Common Block Declarations */
extern struct {
@@ -54,9 +57,12 @@ extern struct {
/* VOICIN Version 52 */
/* $Log$
- * Revision 1.15 2003/11/23 22:14:32 markster
- * Various warning cleanups
+ * Revision 1.16 2004/06/26 03:50:14 markster
+ * Merge source cleanups (bug #1911)
*
+/* Revision 1.15 2003/11/23 22:14:32 markster
+/* Various warning cleanups
+/*
/* Revision 1.14 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/*
@@ -302,9 +308,12 @@ s*/
/* Global Variables: */
/* Arguments */
/* $Log$
- * Revision 1.15 2003/11/23 22:14:32 markster
- * Various warning cleanups
+ * Revision 1.16 2004/06/26 03:50:14 markster
+ * Merge source cleanups (bug #1911)
*
+/* Revision 1.15 2003/11/23 22:14:32 markster
+/* Various warning cleanups
+/*
/* Revision 1.14 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/*