[FFmpeg-cvslog] rtpenc: Add support for packetizing speex

[Dmitry Samonenko]

ffmpeg | branch: master | Dmitry Samonenko <shreddingwork at gmail.com> | Sat Sep 22 14:32:37 2012 +0400| [490ae95aa81db681f426e8ca7f8a539adfebc895] | committer: Martin Storsjö

rtpenc: Add support for packetizing speex

This packetization scheme simply places the full packets into the
RTP packet without any extra header bytes.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=490ae95aa81db681f426e8ca7f8a539adfebc895
---

 libavformat/rtpenc.c  |    1 +
 libavformat/sdp.c     |    4 ++++
 libavformat/version.h |    2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 33a1f05..dc257f6 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -76,6 +76,7 @@ static int is_supported(enum AVCodecID id)
     case AV_CODEC_ID_ADPCM_G726:
     case AV_CODEC_ID_ILBC:
     case AV_CODEC_ID_MJPEG:
+    case AV_CODEC_ID_SPEEX:
         return 1;
     default:
         return 0;
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index a77c8eb..3791930 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -572,6 +572,10 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c,
                                      payload_type, c->sample_rate,
                                      payload_type, c->block_align == 38 ? 20 : 30);
             break;
+        case AV_CODEC_ID_SPEEX:
+            av_strlcatf(buff, size, "a=rtpmap:%d speex/%d\r\n",
+                                     payload_type, c->sample_rate);
+            break;
         default:
             /* Nothing special to do here... */
             break;
diff --git a/libavformat/version.h b/libavformat/version.h
index 2539d60..3cb6d82 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  0
+#define LIBAVFORMAT_VERSION_MICRO  1
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \