diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2014-03-03 14:53:40 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-03-09 16:58:15 -0400 |
| commit | ea3309eba715e83027e8ece4a226e39a4bf2a6ce (patch) | |
| tree | 08a27248b64bb943a06bbc5638e41da6c6086ffb /libavformat | |
| parent | 1c1e252cd1cbd5f59fe118c49f6d7207dbdfdbd4 (diff) | |
| download | ffmpeg-ea3309eba715e83027e8ece4a226e39a4bf2a6ce.tar.gz | |
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.
(cherry picked from commit 1d9014f0b008485eac4c19d5f5e11ede59237167)
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 9b32b7dc57..a6197aba02 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -136,8 +136,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 */ |