[SCM] libav/experimental: matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 558b20d729bc296d8e6a69f03cd509ad26a4827d
Author: Tim Walker <tdskywalker at gmail.com>
Date:   Mon Mar 3 14:53:45 2014 +0000

    matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 3cb7eef..fad1ec4 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) {

-- 
Libav/FFmpeg packaging