diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 06:20:00 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 06:20:00 +0400 |
| commit | 49f11e12d5afa9cd800f3e2f753d83595d5cff5c (patch) | |
| tree | 173dde1f8a794dabad4375c708337ad4f37cb9b3 /libavformat | |
| parent | d130fae51948a2baf69dcf29fdb15f80ea2bc363 (diff) | |
| parent | 9a6a7109985cbd3a20707b40cc31ed53a174195c (diff) | |
Merge commit '9a6a7109985cbd3a20707b40cc31ed53a174195c' into release/2.2
* commit '9a6a7109985cbd3a20707b40cc31ed53a174195c':
matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskaenc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a2f402edcd..7d83665f94 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1371,6 +1371,10 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, if (codec->codec_id == AV_CODEC_ID_H264 && codec->extradata_size > 0 && (AV_RB24(codec->extradata) == 1 || AV_RB32(codec->extradata) == 1)) ff_avc_parse_nal_units_buf(pkt->data, &data, &size); + else if (codec->codec_id == AV_CODEC_ID_HEVC && codec->extradata_size > 6 && + (AV_RB24(codec->extradata) == 1 || AV_RB32(codec->extradata) == 1)) + /* extradata is Annex B, assume the bitstream is too and convert it */ + ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL); else if (codec->codec_id == AV_CODEC_ID_WAVPACK) { int ret = mkv_strip_wavpack(pkt->data, &data, &size); if (ret < 0) { |