From: Yusuke Nakamura <[email protected]>
Signed-off-by: Anton Khirnov <[email protected]>
---
libavformat/isom.c | 3 +++
libavformat/mov.c | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 014096d..372e877 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -136,6 +136,9 @@ 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_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 */
{ AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC-Intra 50M
720p25/50 */
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 60fb999..d9cb36b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1396,6 +1396,8 @@ static int mov_skip_multiple_stsd(MOVContext *c,
AVIOContext *pb,
if (codec_tag &&
(codec_tag == AV_RL32("avc1") ||
+ codec_tag == AV_RL32("hvc1") ||
+ codec_tag == AV_RL32("hev1") ||
(codec_tag != format &&
(c->fc->video_codec_id ? video_codec_id != c->fc->video_codec_id
: codec_tag != MKTAG('j','p','e','g'))))) {
@@ -1471,7 +1473,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext
*pb, int entries)
if (ret < 0)
return ret;
}
- /* this will read extra atoms at the end (wave, alac, damr, avcC, SMI
...) */
+ /* this will read extra atoms at the end (wave, alac, damr, avcC,
hvcC, SMI ...) */
a.size = size - (avio_tell(pb) - start_pos);
if (a.size > 8) {
if ((ret = mov_read_default(c, pb, a)) < 0)
@@ -2604,6 +2606,7 @@ static const MOVParseTableEntry mov_default_parse_table[]
= {
{ MKTAG('c','h','a','n'), mov_read_chan }, /* channel layout */
{ MKTAG('d','v','c','1'), mov_read_dvc1 },
{ MKTAG('s','b','g','p'), mov_read_sbgp },
+{ MKTAG('h','v','c','C'), mov_read_glbl },
{ 0, NULL }
};
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
