From 62eafc6a6dd8c51d6ecabdb3d649043950c4f01b Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 12 Dec 2016 12:26:21 +0100
Subject: [PATCH] lavf/mov: Accept multiple fourcc for AVID 1:1.
Fixes ticket #5982.
---
libavformat/mov.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0b1c1823adf..6c8affc5c1e 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2220,6 +2220,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
if (codec_tag &&
(codec_tag != format &&
+ // AVID 1:1 samples with differing data format and codec tag exist
+ (codec_tag != AV_RL32("AV1x") || format != AV_RL32("AVup")) &&
// prores is allowed to have differing data format and codec tag
codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") &&
// so is dv (sigh)
--
GitLab