aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Volkert <thomas@homer-conferencing.com>2014-10-04 00:17:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-04 23:52:29 +0200
commita16558e12204e5ae4597d5d384bbfca293fe74cb (patch)
tree092ab99cf1cb06a2a856503aef8408dd4b7dc7b3
parent506368f563b80a1b3663d31194171b00fdbf4bed (diff)
downloadffmpeg-a16558e12204e5ae4597d5d384bbfca293fe74cb.tar.gz
sdp: add support for H.261
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1c4c78ee4073b2387681d916a167b758369b9216) Conflicts: libavformat/version.h
-rw-r--r--libavformat/sdp.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 8c831f3607..bc27eae872 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -414,6 +414,19 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c,
payload_type, mode, config ? config : "");
break;
}
+ case AV_CODEC_ID_H261:
+ {
+ const char *pic_fmt = NULL;
+ /* 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)
+ pic_fmt = "CIF=1";
+ 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;
+ }
case AV_CODEC_ID_H263:
case AV_CODEC_ID_H263P:
/* a=framesize is required by 3GPP TS 26.234 (PSS). It