Skip to content

F
ffmpeg.wasm-core
Commit 62eafc6a authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

lavf/mov: Accept multiple fourcc for AVID 1:1. 

Fixes ticket #5982.
parent 9d068896
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
libavformat/mov.c
View file @ 62eafc6a
...@@ -2220,6 +2220,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb, ...@@ -2220,6 +2220,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
if (codec_tag && if (codec_tag &&
(codec_tag != format && (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 // prores is allowed to have differing data format and codec tag
codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") && codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") &&
// so is dv (sigh) // so is dv (sigh)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment