From 6130068453a9634f7dea5ba9a00342a4f8ea656d Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 7 Aug 2018 00:33:40 +0200 Subject: [PATCH] lavf/mov: Force HEVC codec_id for code-point dvh1 and an hvcC atom. The mp4 registration authority accepted a code-point for Dolby Vision HEVC that was already used as a fourcc for DVCPRO 100. Fixes ticket #7347. --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 82cd410a72..6885ef3b4b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1902,6 +1902,8 @@ static int mov_read_glbl(MOVContext *c, AVIOContext *pb, MOVAtom atom) ret = ff_get_extradata(c->fc, st->codecpar, pb, atom.size); if (ret < 0) return ret; + if (atom.type == MKTAG('h','v','c','C') && st->codecpar->codec_tag == MKTAG('d','v','h','1')) + st->codecpar->codec_id = AV_CODEC_ID_HEVC; return 0; }