diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-04-19 17:17:59 +0800 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-04-19 17:17:59 +0800 |
commit | f044c585e2b07479de3aed3a448c6402b89db01c (patch) | |
tree | e1611d27d38b1569a9909448ab20eadd89af31e5 /openbsc/include/openbsc/rtp_proxy.h | |
parent | 6d17dd13143aa67c5b8bc0199ab1aefba82f90a9 (diff) | |
parent | 38e9c821143a9b86227ae02b1830de43b67facab (diff) |
Merge remote branch 'origin/master' into on-waves/bsc-master
Conflicts:
openbsc/include/openbsc/abis_rsl.h
openbsc/include/openbsc/mgcp.h
openbsc/src/abis_rsl.c
openbsc/src/chan_alloc.c
openbsc/src/handover_logic.c
openbsc/src/mgcp/mgcp_network.c
openbsc/src/vty/command.c
openbsc/src/vty_interface.c
Diffstat (limited to 'openbsc/include/openbsc/rtp_proxy.h')
-rw-r--r-- | openbsc/include/openbsc/rtp_proxy.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openbsc/include/openbsc/rtp_proxy.h b/openbsc/include/openbsc/rtp_proxy.h index f82711a8e..65b1a5fac 100644 --- a/openbsc/include/openbsc/rtp_proxy.h +++ b/openbsc/include/openbsc/rtp_proxy.h @@ -28,6 +28,12 @@ #include <osmocore/linuxlist.h> #include <osmocore/select.h> +#define RTP_PT_GSM_FULL 3 +#define RTP_PT_GSM_HALF 96 +#define RTP_PT_GSM_EFR 97 +#define RTP_PT_AMR_FULL 98 +#define RTP_PT_AMR_HALF 99 + enum rtp_rx_action { RTP_NONE, RTP_PROXY, |