[SCM] libav/experimental: movenc: use 'hev1' tag for HEVC in MODE_MOV.

[siretart at users.alioth.debian.org]

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

    movenc: use 'hev1' tag for HEVC in MODE_MOV.
    
    'hvc1' requires that parameter set NAL units be
    present only in the samples entry, but not in the
    samples themselves, requiring that additional
    parameter sets, if present, be filtered out of the
    samples and placed in new, additional sample entries
    if they override or otherwise conflict with the
    parameter sets present in the first sample entry.
    We do not have any way of doing this at present, so
    the files we produce can only comply with the
    restrictions set for the 'hev1' sample entry name in
    ISO/IEC 14496-15.

diff --git a/libavformat/isom.c b/libavformat/isom.c
index 1748d7c..19d6291 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -139,8 +139,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
 
     { AV_CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') },
 
-    { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, /* HEVC/H.265 which indicates parameter sets shall not be in ES */
     { AV_CODEC_ID_HEVC, MKTAG('h', 'e', 'v', '1') }, /* HEVC/H.265 which indicates parameter sets may be in ES */
+    { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, /* HEVC/H.265 which indicates parameter sets shall not be in ES */
 
     { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
     { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'p') }, /* AVC-Intra  50M 720p24/30/60 */

-- 
Libav/FFmpeg packaging