diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-11-30 22:16:09 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-11-30 22:16:09 +0000 |
| commit | 8bdf0ad4098bb8b13473894625860c4ea7e5de7e (patch) | |
| tree | 0e19bd795555f926987ebaef46e12a4f74702a83 /codecs | |
| parent | ac9b982868be71dec3cc9a451563af64fabf675a (diff) | |
| download | wireshark-8bdf0ad4098bb8b13473894625860c4ea7e5de7e.tar.gz wireshark-8bdf0ad4098bb8b13473894625860c4ea7e5de7e.tar.bz2 wireshark-8bdf0ad4098bb8b13473894625860c4ea7e5de7e.zip | |
Tag arguments to decodeXXX routines as unused iff we don't support the
codec.
svn path=/trunk/; revision=53680
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/G722/G722decode.c | 10 | ||||
| -rw-r--r-- | codecs/G726/G726decode.c | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/codecs/G722/G722decode.c b/codecs/G722/G722decode.c index 2286bd0a61..73bc10dbc8 100644 --- a/codecs/G722/G722decode.c +++ b/codecs/G722/G722decode.c @@ -22,6 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" + #include <glib.h> #ifdef HAVE_SPANDSP @@ -43,8 +45,14 @@ initG722(void) #endif } +#ifdef HAVE_SPANDSP +#define _U_NOSPANDSP_ +#else +#define _U_NOSPANDSP_ _U_ +#endif int -decodeG722(void *input, int inputSizeBytes, void *output, int *outputSizeBytes) +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); diff --git a/codecs/G726/G726decode.c b/codecs/G726/G726decode.c index d97e386272..edc337840f 100644 --- a/codecs/G726/G726decode.c +++ b/codecs/G726/G726decode.c @@ -22,6 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" + #include <glib.h> #ifdef HAVE_SPANDSP #include "telephony.h" @@ -49,8 +51,14 @@ void initG726_32(void) /* Packing should be user defined (via the decode dialog) since due to historical reasons two diverging * de facto standards are in use today (see RFC3551). */ +#ifdef HAVE_SPANDSP +#define _U_NOSPANDSP_ +#else +#define _U_NOSPANDSP_ _U_ +#endif int -decodeG726_32(void *input, int inputSizeBytes, void *output, int *outputSizeBytes) +decodeG726_32(void *input _U_NOSPANDSP_, int inputSizeBytes _U_NOSPANDSP_, + void *output _U_NOSPANDSP_, int *outputSizeBytes _U_NOSPANDSP_) { #ifdef HAVE_SPANDSP *outputSizeBytes = 2 * g726_decode(&state, output, (void*) input, inputSizeBytes); |