diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-12-12 12:26:21 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-12-12 12:26:21 +0100 |
| commit | 62eafc6a6dd8c51d6ecabdb3d649043950c4f01b (patch) | |
| tree | 8b84514ed8023eeea5c4e6fab6a8653a44d0bcca /libavformat/mov.c | |
| parent | 9d068896d32280235e2f31f47a75bf1ba313ad1d (diff) | |
lavf/mov: Accept multiple fourcc for AVID 1:1.
Fixes ticket #5982.
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 0b1c1823ad..6c8affc5c1 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) |