diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-26 03:50:14 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-26 03:50:14 +0000 |
commit | 7148691394ad01d0b2c3a6500913d230c99652ce (patch) | |
tree | feff9533d65b873c284ba444827e32141d0ec6a7 /codecs/lpc10/encode.c | |
parent | 67168c5f8c300f29c4175b3ea78255b4dd2fac02 (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/encode.c')
-rwxr-xr-x | codecs/lpc10/encode.c | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/codecs/lpc10/encode.c b/codecs/lpc10/encode.c index 81093ac60..109a42264 100755 --- a/codecs/lpc10/encode.c +++ b/codecs/lpc10/encode.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 @@ -16,11 +19,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 encode_(integer *voice, integer *pitch, real *rms, real *rc, integer *ipitch, integer *irms, integer *irc); -/* comlen contrl_ 12 */ -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -28,6 +26,11 @@ extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer *ipitch, integer *irms, integer *irc); +/* comlen contrl_ 12 */ +#endif + /* Common Block Declarations */ extern struct { @@ -46,9 +49,12 @@ static integer c__2 = 2; /* ENCODE Version 54 */ /* $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 /* @@ -134,9 +140,12 @@ static integer c__2 = 2; integer idel, nbit, i__, j, i2, i3, mrk; /* $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 /* @@ -160,9 +169,12 @@ static integer c__2 = 2; /* Frame size, Prediction order, Pitch period */ /* 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 /* |