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/rtpenc.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/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index dfaccef2e2..c608dfb46a 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -202,9 +202,11 @@ static int rtp_write_header(AVFormatContext *s1) } break; case AV_CODEC_ID_HEVC: - if (st->codec->extradata_size > 21 && - (st->codec->extradata[0] || st->codec->extradata[1] || - st->codec->extradata[2] > 1)) { + /* Only check for the standardized hvcC version of extradata, keeping + * things simple and similar to the avcC/H264 case above, instead + * of trying to handle the pre-standardization versions (as in + * libavcodec/hevc.c). */ + if (st->codec->extradata_size > 21 && st->codec->extradata[0] == 1) { s->nal_length_size = (st->codec->extradata[21] & 0x03) + 1; } break; |