diff options
author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
---|---|---|
committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-vocoder/lib | |
parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) |
Merge branch 'maint'
Diffstat (limited to 'gr-vocoder/lib')
-rw-r--r-- | gr-vocoder/lib/alaw_decode_bs_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/alaw_encode_sb_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/cvsd_decode_bs_impl.cc | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/cvsd_decode_bs_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/cvsd_encode_sb_impl.cc | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/cvsd_encode_sb_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g721_decode_bs_impl.cc | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g721_decode_bs_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g721_encode_sb_impl.cc | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g721_encode_sb_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g723_24_encode_sb_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g723_40_decode_bs_impl.cc | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g723_40_decode_bs_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g723_40_encode_sb_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/gsm_fr_decode_ps_impl.cc | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/gsm_fr_decode_ps_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/gsm_fr_encode_sp_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/ulaw_decode_bs_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/ulaw_encode_sb_impl.h | 2 |
19 files changed, 19 insertions, 19 deletions
diff --git a/gr-vocoder/lib/alaw_decode_bs_impl.h b/gr-vocoder/lib/alaw_decode_bs_impl.h index 37fb6b28c3..cf515bc6f9 100644 --- a/gr-vocoder/lib/alaw_decode_bs_impl.h +++ b/gr-vocoder/lib/alaw_decode_bs_impl.h @@ -40,6 +40,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_ALAW_DECODE_BS_IMPL_H */ diff --git a/gr-vocoder/lib/alaw_encode_sb_impl.h b/gr-vocoder/lib/alaw_encode_sb_impl.h index 0de1e2e6fd..6afa958591 100644 --- a/gr-vocoder/lib/alaw_encode_sb_impl.h +++ b/gr-vocoder/lib/alaw_encode_sb_impl.h @@ -40,6 +40,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_ALAW_ENCODE_SB_IMPL_H */ diff --git a/gr-vocoder/lib/cvsd_decode_bs_impl.cc b/gr-vocoder/lib/cvsd_decode_bs_impl.cc index 57379b2162..b6b42cef60 100644 --- a/gr-vocoder/lib/cvsd_decode_bs_impl.cc +++ b/gr-vocoder/lib/cvsd_decode_bs_impl.cc @@ -189,4 +189,4 @@ namespace gr { } } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ diff --git a/gr-vocoder/lib/cvsd_decode_bs_impl.h b/gr-vocoder/lib/cvsd_decode_bs_impl.h index a9a7cede44..867dfff99b 100644 --- a/gr-vocoder/lib/cvsd_decode_bs_impl.h +++ b/gr-vocoder/lib/cvsd_decode_bs_impl.h @@ -87,6 +87,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_CVSD_DECODE_BS_IMPL_H */ diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.cc b/gr-vocoder/lib/cvsd_encode_sb_impl.cc index b567f7868c..3c8d69c1d2 100644 --- a/gr-vocoder/lib/cvsd_encode_sb_impl.cc +++ b/gr-vocoder/lib/cvsd_encode_sb_impl.cc @@ -189,4 +189,4 @@ namespace gr { } } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.h b/gr-vocoder/lib/cvsd_encode_sb_impl.h index 78bbd3eeb3..546b029d19 100644 --- a/gr-vocoder/lib/cvsd_encode_sb_impl.h +++ b/gr-vocoder/lib/cvsd_encode_sb_impl.h @@ -87,6 +87,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_CVSD_ENCODE_SB_IMPL_H */ diff --git a/gr-vocoder/lib/g721_decode_bs_impl.cc b/gr-vocoder/lib/g721_decode_bs_impl.cc index db23ffa677..74e43e122c 100644 --- a/gr-vocoder/lib/g721_decode_bs_impl.cc +++ b/gr-vocoder/lib/g721_decode_bs_impl.cc @@ -65,4 +65,4 @@ namespace gr { } } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ diff --git a/gr-vocoder/lib/g721_decode_bs_impl.h b/gr-vocoder/lib/g721_decode_bs_impl.h index f5354e1364..40a1475252 100644 --- a/gr-vocoder/lib/g721_decode_bs_impl.h +++ b/gr-vocoder/lib/g721_decode_bs_impl.h @@ -47,6 +47,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_G721_DECODE_BS_IMPL_H */ diff --git a/gr-vocoder/lib/g721_encode_sb_impl.cc b/gr-vocoder/lib/g721_encode_sb_impl.cc index 9293c46a83..73243f814f 100644 --- a/gr-vocoder/lib/g721_encode_sb_impl.cc +++ b/gr-vocoder/lib/g721_encode_sb_impl.cc @@ -65,4 +65,4 @@ namespace gr { } } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ diff --git a/gr-vocoder/lib/g721_encode_sb_impl.h b/gr-vocoder/lib/g721_encode_sb_impl.h index 5fc3388ef9..73fb0eea45 100644 --- a/gr-vocoder/lib/g721_encode_sb_impl.h +++ b/gr-vocoder/lib/g721_encode_sb_impl.h @@ -47,6 +47,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_G721_ENCODE_SB_IMPL_H */ diff --git a/gr-vocoder/lib/g723_24_encode_sb_impl.h b/gr-vocoder/lib/g723_24_encode_sb_impl.h index 9bad56009e..9b18a0e93f 100644 --- a/gr-vocoder/lib/g723_24_encode_sb_impl.h +++ b/gr-vocoder/lib/g723_24_encode_sb_impl.h @@ -47,6 +47,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_G723_24_ENCODE_SB_IMPL_H */ diff --git a/gr-vocoder/lib/g723_40_decode_bs_impl.cc b/gr-vocoder/lib/g723_40_decode_bs_impl.cc index 4302583200..78bc99d925 100644 --- a/gr-vocoder/lib/g723_40_decode_bs_impl.cc +++ b/gr-vocoder/lib/g723_40_decode_bs_impl.cc @@ -65,4 +65,4 @@ namespace gr { } } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ diff --git a/gr-vocoder/lib/g723_40_decode_bs_impl.h b/gr-vocoder/lib/g723_40_decode_bs_impl.h index 4efd8c5905..81a08727a4 100644 --- a/gr-vocoder/lib/g723_40_decode_bs_impl.h +++ b/gr-vocoder/lib/g723_40_decode_bs_impl.h @@ -47,6 +47,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_G723_40_DECODE_BS_IMPL_H */ diff --git a/gr-vocoder/lib/g723_40_encode_sb_impl.h b/gr-vocoder/lib/g723_40_encode_sb_impl.h index f2160b7097..326ed7def8 100644 --- a/gr-vocoder/lib/g723_40_encode_sb_impl.h +++ b/gr-vocoder/lib/g723_40_encode_sb_impl.h @@ -47,6 +47,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_G723_40_ENCODE_SB_IMPL_H */ diff --git a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc index e318a60668..97fbc1b9b0 100644 --- a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc +++ b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc @@ -74,4 +74,4 @@ namespace gr { } } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ diff --git a/gr-vocoder/lib/gsm_fr_decode_ps_impl.h b/gr-vocoder/lib/gsm_fr_decode_ps_impl.h index 878d40c92a..3e60b21293 100644 --- a/gr-vocoder/lib/gsm_fr_decode_ps_impl.h +++ b/gr-vocoder/lib/gsm_fr_decode_ps_impl.h @@ -47,6 +47,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_GSM_FR_DECODE_PS_IMPL_H */ diff --git a/gr-vocoder/lib/gsm_fr_encode_sp_impl.h b/gr-vocoder/lib/gsm_fr_encode_sp_impl.h index c4629dd984..4a859d7b30 100644 --- a/gr-vocoder/lib/gsm_fr_encode_sp_impl.h +++ b/gr-vocoder/lib/gsm_fr_encode_sp_impl.h @@ -47,6 +47,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_GSM_FR_ENCODE_SP_IMPL_H */ diff --git a/gr-vocoder/lib/ulaw_decode_bs_impl.h b/gr-vocoder/lib/ulaw_decode_bs_impl.h index 9e5d238b49..20390466c7 100644 --- a/gr-vocoder/lib/ulaw_decode_bs_impl.h +++ b/gr-vocoder/lib/ulaw_decode_bs_impl.h @@ -40,6 +40,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_ULAW_DECODE_BS_IMPL_H */ diff --git a/gr-vocoder/lib/ulaw_encode_sb_impl.h b/gr-vocoder/lib/ulaw_encode_sb_impl.h index 48227a86da..c9d3eb2345 100644 --- a/gr-vocoder/lib/ulaw_encode_sb_impl.h +++ b/gr-vocoder/lib/ulaw_encode_sb_impl.h @@ -40,6 +40,6 @@ namespace gr { }; } /* namespace vocoder */ -} /* namespace gr */ +} /* namespace gr */ #endif /* INCLUDED_VOCODER_ULAW_ENCODE_SB_IMPL_H */ |