diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 02:33:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 02:34:17 +0100 |
| commit | 5162af67f41214edacefe05d9723e4a6d9847900 (patch) | |
| tree | e07706bd952bc563e0b56adc26199675e19238d1 /libavformat/sdp.c | |
| parent | 3f5d1c8130b1326d779c4216886272a3efce816a (diff) | |
| parent | a505c0d7373336a4cc5aa2022111c46bdd388b1f (diff) | |
| download | ffmpeg-5162af67f41214edacefe05d9723e4a6d9847900.tar.gz | |
Merge commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f'
* commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f':
rtp: Initial H.261 support
Conflicts:
Changelog
libavformat/rtpdec_h261.c
libavformat/rtpenc_h261.c
libavformat/sdp.c
libavformat/version.h
See: 50a4d5cfc6749932347ee38c25b5040aea4b13a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sdp.c')
| -rw-r--r-- | libavformat/sdp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c index fadabbe5ae..4d621c7ffc 100644 --- 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; |