diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-01-08 01:58:06 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-01-08 01:58:06 +0000 |
| commit | a6ed8a1de97a70668a8feaeade2a11cc4c93185f (patch) | |
| tree | 1529c9c6c81761de06c0f3664af019d9e7bc2a95 /codecs/G722 | |
| parent | 2adcfcd914d60b7baa3344c26d9976081f7a533c (diff) | |
| download | wireshark-a6ed8a1de97a70668a8feaeade2a11cc4c93185f.tar.gz | |
Have HAVE_SPANDSP just go over entire file rather than individual functions.
svn path=/trunk/; revision=54645
Diffstat (limited to 'codecs/G722')
| -rw-r--r-- | codecs/G722/G722decode.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/codecs/G722/G722decode.c b/codecs/G722/G722decode.c index e7e47dfa78..b668b2bf57 100644 --- a/codecs/G722/G722decode.c +++ b/codecs/G722/G722decode.c @@ -29,33 +29,23 @@ #ifdef HAVE_SPANDSP #include "telephony.h" #include "g722.h" -#endif #include "G722decode.h" -#ifdef HAVE_SPANDSP static g722_decode_state_t state; -#endif void initG722(void) { -#ifdef HAVE_SPANDSP memset (&state, 0, sizeof (state)); g722_decode_init(&state, 64000, 0); -#endif } -#ifdef HAVE_SPANDSP -#define _U_NOSPANDSP_ -#else -#define _U_NOSPANDSP_ _U_ -#endif int decodeG722(void *input _U_NOSPANDSP_, int inputSizeBytes _U_NOSPANDSP_, void *output _U_NOSPANDSP_, int *outputSizeBytes _U_NOSPANDSP_) { -#ifdef HAVE_SPANDSP *outputSizeBytes = g722_decode(&state, output, input, inputSizeBytes); -#endif return 0; } + +#endif |