diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 2a0770e300..91b9c05f33 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -85,7 +85,7 @@ static int rtp_write_header(AVFormatContext *s1)
 
     payload_type = ff_rtp_get_payload_type(st->codec);
     if (payload_type < 0)
-        payload_type = RTP_PT_PRIVATE; /* private payload type */
+        payload_type = RTP_PT_PRIVATE + (st->codec->codec_type == CODEC_TYPE_AUDIO);
     s->payload_type = payload_type;
 
 // following 2 FIXMEs could be set based on the current time, there is normally no info leak, as RTP will likely be transmitted immediately
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 0a286417e1..2d42572589 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -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 = RTP_PT_PRIVATE;  /* FIXME: how to assign a private pt? rtp.c is broken too */
+        payload_type = RTP_PT_PRIVATE + (c->codec_type == CODEC_TYPE_AUDIO);
     }
 
     switch (c->codec_type) {