From patchwork Tue Nov 8 03:32:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 1333 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1480490vsb; Mon, 7 Nov 2016 19:46:52 -0800 (PST) X-Received: by 10.28.214.73 with SMTP id n70mr13741691wmg.6.1478576812834; Mon, 07 Nov 2016 19:46:52 -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 h132si14221287wmd.145.2016.11.07.19.46.52; Mon, 07 Nov 2016 19:46:52 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 94AC8689C32; Tue, 8 Nov 2016 05:46:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0949689B94 for ; Tue, 8 Nov 2016 05:46:39 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id 124so6929087qkh.1 for ; Mon, 07 Nov 2016 19:46:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=hUUmgm2LlbN6x/sfAhhY5FScR+CqiBzmlzlBtaSVeP8=; b=EoNojhlz/yuiljJMxgXXBGNXSG4rcYEA5KDbE9Kga+8gdkJUAGCjF3Qqq8k5NH+XAR ZalUcj3n1Pru3xXZajTgDSbnirkELpABs4hMdY3O48sSNIPFBZkX0dnIMMutoEPLAwXR OWDwjcdB0Gwi+5IkBsX2eGy4NVSoov9CknGM6KNy+rZx5zZHhYY3MPgEYaS1EYq45jrE S0fJbwQPZn8BQHwtSFd0UCN1SzZhzYIsP0vh/6Fib/Y8ylLAKVvlhtJoTfDFDd+OCR7B 9l6jpbU/RpZ2lfgyByS9yCHYqSVzB6PaI2he1sKAJJd5LPXyHhBxkMxICdJIWXeiuOLL VOlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=hUUmgm2LlbN6x/sfAhhY5FScR+CqiBzmlzlBtaSVeP8=; b=SvnvYIfcrecuvtBFPUYcRBnuHUi11DjoCTe7s1BNW3sGCfnWq+tTcg3sQg2qvQTVFi GIDG/Hp4Eh7DrIqUypUVi+zeCX6ItsFmichNN7wk6/GLZEx/41gf0NVfX23be6smGYuX 7A4NhT7c0vrfoH80oPPvuFEwRwS418Lv33ymAvcVc9LJCogQ1RGakQxkZQeHTm6VtKab 3JjuMJhBk7XQEYZqV4nICyq307+rKvor8tzPsWMKMNAgFaEImmjE3EhVUkJcPYb/+8sX e+2/FX91Zou8YrrsWEWs3B/1+DUrvQAsYgPceLgfdGV9aSDhMrz19YxnWbjXSJXCyL1G GzjQ== X-Gm-Message-State: ABUngvc5UCGrhGRuKTpLfCLYWmBGrZRoauhzNWewcEmxC4n4lGw1V7n9mr1KyNEWF/+3eQ== X-Received: by 10.55.149.134 with SMTP id x128mr9241877qkd.263.1478575926424; Mon, 07 Nov 2016 19:32:06 -0800 (PST) Received: from vimacbookpro.vimeows.com (cpe-24-193-79-62.nyc.res.rr.com. [24.193.79.62]) by smtp.gmail.com with ESMTPSA id v56sm7334421qtc.34.2016.11.07.19.32.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Nov 2016 19:32:05 -0800 (PST) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Nov 2016 22:32:05 -0500 Message-Id: <20161108033205.69369-1-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.10.0 Subject: [FFmpeg-devel] [PATCH] mov: Read multiple stsd from DV 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Vittorio Giovara --- Sorry, I can't share the sample or add a fate for this. Please CC. Vittorio libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index e283034..a2a688b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2219,6 +2219,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb, (codec_tag != format && // 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) + codec_tag != AV_RL32("dvpp") && codec_tag != AV_RL32("dvcp") && (c->fc->video_codec_id ? video_codec_id != c->fc->video_codec_id : codec_tag != MKTAG('j','p','e','g')))) { /* Multiple fourcc, we skip JPEG. This is not correct, we should