From patchwork Tue Nov 29 21:10:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 1605 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp23834vsa; Tue, 29 Nov 2016 13:11:05 -0800 (PST) X-Received: by 10.194.10.72 with SMTP id g8mr29728678wjb.57.1480453865792; Tue, 29 Nov 2016 13:11:05 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p194si5045567wme.0.2016.11.29.13.11.03; Tue, 29 Nov 2016 13:11:05 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 43458689E16; Tue, 29 Nov 2016 23:10:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0478689D93 for ; Tue, 29 Nov 2016 23:10:48 +0200 (EET) Received: from [172.31.218.41] (helo=vie01a-dmta-pe04-2.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cBpfy-0005CQ-Lg for ffmpeg-devel@ffmpeg.org; Tue, 29 Nov 2016 22:10:54 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cBpfs-0007Gp-SM for ffmpeg-devel@ffmpeg.org; Tue, 29 Nov 2016 22:10:48 +0100 Received: from [192.168.1.3] ([80.110.108.40]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id DxAn1u01E0sKnS801xAoRL; Tue, 29 Nov 2016 22:10:48 +0100 X-SourceIP: 80.110.108.40 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Tue, 29 Nov 2016 22:10:47 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201611292210.47736.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/mov: Accept multiple fourcc for AVID 1:1 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes ticket #5982. Please comment, Carl Eugen From add7f5d51491152af6d0431331543212c2c21ca4 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos 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)