[FFmpeg-devel] [PATCH]lavf/mov: Accept multiple fourcc for AVID 1:1

[Carl Eugen Hoyos]

Hi!

Attached patch fixes ticket #5982.

Please comment, Carl Eugen
-------------- next part --------------
From add7f5d51491152af6d0431331543212c2c21ca4 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date: Tue, 29 Nov 2016 22:09:21 +0100
Subject: [PATCH] lavf/mov: Accept multiple fourcc for AVID 1:1.

Fixes ticket #5982.
---
 libavformat/mov.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 9bbb155..1c2d88d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2212,6 +2212,7 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
 
     if (codec_tag &&
          (codec_tag != format &&
+          (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)
-- 
1.7.10.4