diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2014-03-03 18:53:45 +0400 |
|---|---|---|
| committer | Tim Walker <tdskywalker@gmail.com> | 2014-03-21 03:55:16 +0400 |
| commit | 9a6a7109985cbd3a20707b40cc31ed53a174195c (patch) | |
| tree | 7b31ac98a82ff252d4addf045fe49598de3c8159 /libavformat | |
| parent | daaef403d122b35d87b27d6b369d287b1ed06973 (diff) | |
matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
(cherry picked from commit 558b20d729bc296d8e6a69f03cd509ad26a4827d)
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 3cb7eef25b..fad1ec41cc 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1167,6 +1167,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) { |