diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 23:40:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 23:41:02 +0100 |
| commit | fb0023639ea5bc3071fbe5686125d5ff873950b0 (patch) | |
| tree | 1e16405d074a54921e04b2a2105d3b68bc60675c | |
| parent | 38aee6408a6732b8ac86341dabf6683c08caa1c1 (diff) | |
| parent | 558b20d729bc296d8e6a69f03cd509ad26a4827d (diff) | |
| download | ffmpeg-fb0023639ea5bc3071fbe5686125d5ff873950b0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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) { |