diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-08-07 00:33:40 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-08-09 00:44:07 +0200 |
| commit | 6130068453a9634f7dea5ba9a00342a4f8ea656d (patch) | |
| tree | be8beb1b647a4c82ef8b8efcb54f775a5ed405d5 /libavformat/mov.c | |
| parent | af4c2acddd15ddac97eb4c9f23bfe593ec73b59d (diff) | |
| download | ffmpeg-6130068453a9634f7dea5ba9a00342a4f8ea656d.tar.gz | |
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.
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |