From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 12 Dec 2016 11:26:21 +0000 (+0100)
Subject: lavf/mov: Accept multiple fourcc for AVID 1:1.
X-Git-Tag: android-x86-7.1-r1~2738
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=62eafc6a6dd8c51d6ecabdb3d649043950c4f01b;p=android-x86%2Fexternal-ffmpeg.git

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

Fixes ticket #5982.
---

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)