diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-25 00:15:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-25 00:17:36 +0200 |
| commit | d8ddac363e77eb55150c80febc56ad58d53968e8 (patch) | |
| tree | 1b7284cab39ab12d4c63c81a89f1bed35592d7e9 /libavformat/sdp.c | |
| parent | b8d3f7fc21b987378bb6042e038d7f598374dba8 (diff) | |
| parent | ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc (diff) | |
| download | ffmpeg-d8ddac363e77eb55150c80febc56ad58d53968e8.tar.gz | |
Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'
* commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc':
rtpenc: HEVC/H.265 support
Conflicts:
Changelog
libavformat/rtpenc.c
libavformat/rtpenc_hevc.c
libavformat/version.h
See: 6821a5a4adcb40c458356e8bb90416dd8f5dd6b2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sdp.c')
| -rw-r--r-- | libavformat/sdp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 8c831f3607..a926cf89f2 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -428,6 +428,12 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, payload_type, payload_type, c->width, c->height); break; + case AV_CODEC_ID_HEVC: + if (c->extradata_size) + av_log(NULL, AV_LOG_WARNING, "HEVC extradata not currently " + "passed properly through SDP\n"); + av_strlcatf(buff, size, "a=rtpmap:%d H265/90000\r\n", payload_type); + break; case AV_CODEC_ID_MPEG4: if (c->extradata_size) { config = extradata2config(c); |