Merge commit '46808fdf04ab113df374157b90b506eb3110daf2'

[ffmpeg] / libavformat / sdp.c

diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index fadabbe5ae5ebb6b9045bc5b1d4910bcb3e834e7..4d621c7ffc97820d8019db9cca1ee6c747b2ced0 100644 (file)
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -504,9 +504,10 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c,
             /* only QCIF and CIF are specified as supported in RFC 4587 */
             if (c->width == 176 && c->height == 144)
                 pic_fmt = "QCIF=1";
-            if (c->width == 352 && c->height == 288)
+            else if (c->width == 352 && c->height == 288)
                 pic_fmt = "CIF=1";
-            av_strlcatf(buff, size, "a=rtpmap:%d H261/90000\r\n", payload_type);
+            if (payload_type >= RTP_PT_PRIVATE)
+                av_strlcatf(buff, size, "a=rtpmap:%d H261/90000\r\n", payload_type);
             if (pic_fmt)
                 av_strlcatf(buff, size, "a=fmtp:%d %s\r\n", payload_type, pic_fmt);
             break;