aboutsummaryrefslogtreecommitdiffstats
path: root/codecs/lpc10/dyptrk.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-06-26 03:50:14 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-06-26 03:50:14 +0000
commit7148691394ad01d0b2c3a6500913d230c99652ce (patch)
treefeff9533d65b873c284ba444827e32141d0ec6a7 /codecs/lpc10/dyptrk.c
parent67168c5f8c300f29c4175b3ea78255b4dd2fac02 (diff)
Merge source cleanups (bug #1911)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3311 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/lpc10/dyptrk.c')
-rwxr-xr-xcodecs/lpc10/dyptrk.c27
1 files changed, 18 insertions, 9 deletions
diff --git a/codecs/lpc10/dyptrk.c b/codecs/lpc10/dyptrk.c
index 7a5c136b9..4a4b1a14f 100755
--- a/codecs/lpc10/dyptrk.c
+++ b/codecs/lpc10/dyptrk.c
@@ -1,6 +1,9 @@
/*
$Log$
+Revision 1.15 2004/06/26 03:50:14 markster
+Merge source cleanups (bug #1911)
+
Revision 1.14 2003/02/12 13:59:15 matteo
mer feb 12 14:56:57 CET 2003
@@ -24,11 +27,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 dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, integer *pitch, integer *midx, struct lpc10_encoder_state *st);
-/* comlen contrl_ 12 */
-#endif
-
/* -- translated by f2c (version 19951025).
You must link the resulting object file with the libraries:
-lf2c -lm (in that order)
@@ -36,6 +34,11 @@ extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, i
#include "f2c.h"
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, integer *pitch, integer *midx, struct lpc10_encoder_state *st);
+/* comlen contrl_ 12 */
+#endif
+
/* Common Block Declarations */
extern struct {
@@ -50,9 +53,12 @@ extern struct {
/* DYPTRK Version 52 */
/* $Log$
- * Revision 1.14 2003/02/12 13:59:15 matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15 2004/06/26 03:50:14 markster
+ * Merge source cleanups (bug #1911)
*
+/* Revision 1.14 2003/02/12 13:59:15 matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/*
@@ -142,9 +148,12 @@ extern struct {
/* Arguments */
/* $Log$
- * Revision 1.14 2003/02/12 13:59:15 matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15 2004/06/26 03:50:14 markster
+ * Merge source cleanups (bug #1911)
*
+/* Revision 1.14 2003/02/12 13:59:15 matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/*