diff --git a/libavformat/mov.c b/libavformat/mov.c index 0b1c1823adf8029fc20488209c5be6dc10c2b566..6c8affc5c1e56fa0a0427fa447be7b586969d5ec 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)