diff options
| author | Michael Niedermayer | 2012-09-24 13:53:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2012-09-24 13:54:24 +0200 |
| commit | ff584803b7ea31febb3f57124a3702d13c27e24c (patch) | |
| tree | b8f22d7053d443db3929d5fe210a2c1a18eca3c8 /libavformat/sdp.c | |
| parent | 874b9dcc4be78847e488df33aad51752a8bebc2e (diff) | |
| parent | cee1950bbb44acd215efd2101fb52d9605701969 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtp: Packetization of JPEG (RFC 2435)
smoothstreamingenc: Copy the SAR on the AVStreams as well
Conflicts:
Changelog
libavformat/rtpenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sdp.c')
| -rw-r--r-- | libavformat/sdp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 8ff4325817..96b6c44e05 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -547,6 +547,11 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, av_strlcatf(buff, size, "a=rtpmap:%d VP8/90000\r\n", payload_type); break; + case AV_CODEC_ID_MJPEG: + if (payload_type >= RTP_PT_PRIVATE) + av_strlcatf(buff, size, "a=rtpmap:%d JPEG/90000\r\n", + payload_type); + break; case AV_CODEC_ID_ADPCM_G722: if (payload_type >= RTP_PT_PRIVATE) av_strlcatf(buff, size, "a=rtpmap:%d G722/%d/%d\r\n", |