diff options
| author | Johnathan Corgan | 2011-12-11 13:07:11 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2011-12-11 13:07:11 -0800 |
| commit | c51087bb7f005981f4b74c6a48f59a5982721951 (patch) | |
| tree | 07905082947d982034a5b3b2f4426a3c3a203d0b /gr-vocoder | |
| parent | 912cd08e133dae9fa9ceec055ba23cd970a0c254 (diff) | |
| parent | fe21bc676424196a228ba4fe9c924e3ae1954e07 (diff) | |
| download | gnuradio-c51087bb7f005981f4b74c6a48f59a5982721951.tar.gz gnuradio-c51087bb7f005981f4b74c6a48f59a5982721951.tar.bz2 gnuradio-c51087bb7f005981f4b74c6a48f59a5982721951.zip | |
Merge branch 'master' into next
Conflicts:
config/lf_warnings.m4
volk/config/lf_warnings.m4
Diffstat (limited to 'gr-vocoder')
| -rw-r--r-- | gr-vocoder/lib/codec2/fft.c | 2 | ||||
| -rw-r--r-- | gr-vocoder/lib/codec2/interp.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gr-vocoder/lib/codec2/fft.c b/gr-vocoder/lib/codec2/fft.c index a33e4d2c8..a3027e4cd 100644 --- a/gr-vocoder/lib/codec2/fft.c +++ b/gr-vocoder/lib/codec2/fft.c @@ -72,7 +72,7 @@ initialize_fft (int n) void fft (float x[], int n, int isign) { - int isReverse = 0; + //int isReverse = 0; // never used int c; kiss_fft_cfg cfg; if (cfg_forward == NULL) diff --git a/gr-vocoder/lib/codec2/interp.c b/gr-vocoder/lib/codec2/interp.c index 135d8c9e7..257c4a81c 100644 --- a/gr-vocoder/lib/codec2/interp.c +++ b/gr-vocoder/lib/codec2/interp.c @@ -436,7 +436,8 @@ void interpolate_lsp( float *ak_interp /* interpolated aks for this frame */ ) { - int l,i; + //int l,i; + int i; float lsps[LPC_ORD],e; float snr; |