From 3db853b4281290ee06963dd01cf27009710110dd Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Sat, 26 Jun 2004 03:50:14 +0000 Subject: Merge source cleanups (bug #1911) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3311 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/lpc10/decode.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'codecs/lpc10/decode.c') diff --git a/codecs/lpc10/decode.c b/codecs/lpc10/decode.c index 6d129b360..8a1661647 100755 --- a/codecs/lpc10/decode.c +++ b/codecs/lpc10/decode.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/09/19 01:20:22 markster Code cleanups (bug #66) @@ -27,13 +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 decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st); -/* comlen contrl_ 12 */ -/*:ref: ham84_ 14 3 4 4 4 */ -/*:ref: median_ 4 3 4 4 4 */ -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -41,6 +37,13 @@ extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st); +/* comlen contrl_ 12 */ +/*:ref: ham84_ 14 3 4 4 4 */ +/*:ref: median_ 4 3 4 4 4 */ +#endif + /* Common Block Declarations */ extern struct { @@ -59,9 +62,12 @@ static integer c__2 = 2; /* DECODE Version 54 */ /* $Log$ - * Revision 1.15 2003/09/19 01:20:22 markster - * Code cleanups (bug #66) + * Revision 1.16 2004/06/26 03:50:14 markster + * Merge source cleanups (bug #1911) * +/* Revision 1.15 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.2 2003/09/19 01:20:22 markster /* Code cleanups (bug #66) /* @@ -200,9 +206,12 @@ static integer c__2 = 2; integer ishift, errcnt, lsb; /* $Log$ - * Revision 1.15 2003/09/19 01:20:22 markster - * Code cleanups (bug #66) + * Revision 1.16 2004/06/26 03:50:14 markster + * Merge source cleanups (bug #1911) * +/* Revision 1.15 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.2 2003/09/19 01:20:22 markster /* Code cleanups (bug #66) /* @@ -237,9 +246,12 @@ static integer c__2 = 2; /* Frame size, Prediction order, Pitch period */ /* Arguments */ /* $Log$ - * Revision 1.15 2003/09/19 01:20:22 markster - * Code cleanups (bug #66) + * Revision 1.16 2004/06/26 03:50:14 markster + * Merge source cleanups (bug #1911) * +/* Revision 1.15 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.2 2003/09/19 01:20:22 markster /* Code cleanups (bug #66) /* -- cgit v1.2.3