diff options
| author | Tom Rondeau | 2012-02-23 11:14:44 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-02-23 11:14:44 -0500 |
| commit | 5c6877db1b91ad6fafec9fce83bc7f9079493d39 (patch) | |
| tree | a0211bea9082fde6e25c5d9ac2f5e00e92b56183 /gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml | |
| parent | 4f0b3fbe765b9f4ce744e2c2c182715fc63756e2 (diff) | |
| parent | 330cddf31208b843c0997c6fb05cb3facf31f536 (diff) | |
| download | gnuradio-5c6877db1b91ad6fafec9fce83bc7f9079493d39.tar.gz gnuradio-5c6877db1b91ad6fafec9fce83bc7f9079493d39.tar.bz2 gnuradio-5c6877db1b91ad6fafec9fce83bc7f9079493d39.zip | |
Merge remote branch 'bistromath/volk_fix' into safe_align
Conflicts:
volk/apps/volk_profile.cc
Diffstat (limited to 'gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml')
| -rw-r--r-- | gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml b/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml index d39994b6b..13f6f3f2d 100644 --- a/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml +++ b/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml @@ -6,9 +6,9 @@ --> <block> <name>GSM full-rate Audio Encoder</name> - <key>vocoder_gsm_fr_encode_sb</key> + <key>vocoder_gsm_fr_encode_sp</key> <import>from gnuradio import vocoder</import> - <make>vocoder.gsm_fr_encode_sb()</make> + <make>vocoder.gsm_fr_encode_sp()</make> <sink> <name>in</name> <type>short</type> |