aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorDmitry Samonenko <shreddingwork@gmail.com>2012-09-22 14:39:03 +0400
committerMartin Storsjö <martin@martin.st>2012-09-26 19:05:10 +0300
commitb6bf1490daa85fdbf5464525e9ca19dee0b520e2 (patch)
tree44e05221f382aec623e440817408cfb2bef7beb5 /libavformat
parent490ae95aa81db681f426e8ca7f8a539adfebc895 (diff)
downloadffmpeg-b6bf1490daa85fdbf5464525e9ca19dee0b520e2.tar.gz
rtpdec: Support depacketizing speex
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rtpdec.c7
-rw-r--r--libavformat/version.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index fedab61988..8b6f7b7327 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -49,6 +49,12 @@ static RTPDynamicProtocolHandler ff_realmedia_mp3_dynamic_handler = {
.codec_id = AV_CODEC_ID_MP3ADU,
};
+static RTPDynamicProtocolHandler speex_dynamic_handler = {
+ .enc_name = "speex",
+ .codec_type = AVMEDIA_TYPE_AUDIO,
+ .codec_id = AV_CODEC_ID_SPEEX,
+};
+
/* statistics functions */
static RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL;
@@ -78,6 +84,7 @@ void av_register_rtp_dynamic_payload_handlers(void)
ff_register_dynamic_payload_handler(&ff_vp8_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_qcelp_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_realmedia_mp3_dynamic_handler);
+ ff_register_dynamic_payload_handler(&speex_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfv_handler);
ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfa_handler);
diff --git a/libavformat/version.h b/libavformat/version.h
index 3cb6d82e10..f343a38a78 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR 17
-#define LIBAVFORMAT_VERSION_MICRO 1
+#define LIBAVFORMAT_VERSION_MICRO 2
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \