From 6399c17d545e9666e3eece87b136d0107a900c5d Mon Sep 17 00:00:00 2001 From: Luca Abeni Date: Sun, 27 Dec 2009 21:31:10 +0000 Subject: [PATCH] Use different dynamic payload types for audio and video. Originally committed as revision 20940 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtpenc.c | 2 +- libavformat/sdp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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) {