[SCM] libav/experimental: Use RTP_PT_PRIVATE in sdp.c instead of hardcoding 96.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:56:22 UTC 2013


The following commit has been merged in the experimental branch:
commit f877954fd33b7b03bb09735298faffef1f65f14d
Author: Luca Abeni <lucabe72 at email.it>
Date:   Sat Dec 26 10:59:56 2009 +0000

    Use RTP_PT_PRIVATE in sdp.c instead of hardcoding 96.
    
    Originally committed as revision 20922 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 8328070..0a28641 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -211,19 +211,19 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c,
                                      payload_type, config);
             break;
         case CODEC_ID_PCM_S16BE:
-            if (payload_type >= 96)
+            if (payload_type >= RTP_PT_PRIVATE)
                 av_strlcatf(buff, size, "a=rtpmap:%d L16/%d/%d\r\n",
                                          payload_type,
                                          c->sample_rate, c->channels);
             break;
         case CODEC_ID_PCM_MULAW:
-            if (payload_type >= 96)
+            if (payload_type >= RTP_PT_PRIVATE)
                 av_strlcatf(buff, size, "a=rtpmap:%d PCMU/%d/%d\r\n",
                                          payload_type,
                                          c->sample_rate, c->channels);
             break;
         case CODEC_ID_PCM_ALAW:
-            if (payload_type >= 96)
+            if (payload_type >= RTP_PT_PRIVATE)
                 av_strlcatf(buff, size, "a=rtpmap:%d PCMA/%d/%d\r\n",
                                          payload_type,
                                          c->sample_rate, c->channels);
@@ -257,7 +257,7 @@ static void sdp_write_media(char *buff, int size, AVCodecContext *c, const char
 
     payload_type = ff_rtp_get_payload_type(c);
     if (payload_type < 0) {
-        payload_type = 96;  /* FIXME: how to assign a private pt? rtp.c is broken too */
+        payload_type = RTP_PT_PRIVATE;  /* FIXME: how to assign a private pt? rtp.c is broken too */
     }
 
     switch (c->codec_type) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list