From patchwork Wed Apr 4 19:30:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Trimble X-Patchwork-Id: 8331 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp5241303jad; Wed, 4 Apr 2018 12:32:55 -0700 (PDT) X-Google-Smtp-Source: AIpwx49SokO0HF2HeeQR71zllUzclLuaySMYe3BrM7K2RML/VM+o/3QOVysyUUsjPOl7nG5UowyS X-Received: by 10.28.5.198 with SMTP id 189mr7750296wmf.155.1522870375290; Wed, 04 Apr 2018 12:32:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522870375; cv=none; d=google.com; s=arc-20160816; b=oSeVSgFC2sCVV1Dde+TzslgMUKZlB14xrlK8g/EkrC9lB5xNFrhlkaiW0SzKKziPvv iXnpo7MlzN9KFntHZf/seG5hH0/ZEQQjMXd139Ef+Yjb03f7Ao3Hmxx26FnS0jWYaxO2 UaXpnY2jq8C+WE4J4IIaNG49UoTmlxVevkkWwEsmhvuN+rDQY1aFI9J6t7DHSM7OXwJn J4tcZ6VJAuYoJMexq+PmVyr9ETdHR29KBakE44rsZA+C8Mp+QJKV37elQlx84zwVUpA5 8YR7e/XByNt4jP3QAeJ9YSZZjM8AwHXcdtFDaX99HBFQ7PipStXTgau1C6+XqcTANXLm K1gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:from:message-id:date:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=Rqe69kMYlXAgnVwLZHgHHqZqhqXXLHFg939X8jLR7mQ=; b=VYlSa2GWgG7B44TtGzI17Sj4ifrpw19IHDiOaClh0+MriaM9OX2dv5wuxV3YSgkZ+x 3pRP23U7y5Wcg4pci/HOAoMOf1LT/+oSdVn07aljlzjNzPqhMCiBLEqJqZJNOUjYs76j h6T/bANfJ+d+VhzzGSWEoWEPAUlRYGyRNGwBIDhvOngRhsC5Cep78BTZ4IFFXDU1BBS5 sJglnfCFA8fLIQVybLA8knYBrRFc5NUadMBfLO+YQn+4N34gqSPKg3IbijjHBgzNfrwA nJpoegU6MSP5DaHtsz6UC5ojmVasGMIbSTx1EKtMmbCsu0mJ16vxZnwYKvNKZos8hTF6 +NsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=GKe5ILbD; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l73si3155843wma.7.2018.04.04.12.32.54; Wed, 04 Apr 2018 12:32:55 -0700 (PDT) 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=@google.com header.s=20161025 header.b=GKe5ILbD; 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 6113B689A22; Wed, 4 Apr 2018 22:32:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f201.google.com (mail-io0-f201.google.com [209.85.223.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 417036800E0 for ; Wed, 4 Apr 2018 22:32:24 +0300 (EEST) Received: by mail-io0-f201.google.com with SMTP id m3so20078265ioe.17 for ; Wed, 04 Apr 2018 12:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:message-id:subject:from:to:cc; bh=hUIUtdl0zfkC+GDH2RTgdy5w73hrPTy592K5xCOFOZo=; b=GKe5ILbDoFB5jfF5JFIrl/akrke3IFgHClRALcyIQvtINyqh2JTBYU24t3/MimBHBY 4YEsL1Hg4HYm2TDdDDXHMG4l3cZWMa45nuGhFucQIRA4luGP0wN2g/caorcndA/5QZpN +FMZbytcc4SHKeEHFOvRQP2SsPrI55UQFmzH2ZN9AH8Qg/3SXRMyoaZDzEk+RMWP6PYH lxeofL0kExqAgur4krZGo0bG2kE10zFTfxivSGIpPW9UKXaU2G8QFhgPa6b2dPok0qGP AfKM7VX7SJtAcAhbgWFSlazH2pdtMvDatAPKKPS1KnQRsoHeuobX8hliaYecalm2LDAc 5+NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=hUIUtdl0zfkC+GDH2RTgdy5w73hrPTy592K5xCOFOZo=; b=r3bLw0EAq+h6MQrcpkMtDNpx8/mp39e35p4cCikW/ZPNvvHwsD85VRK4SUNm/T5NDO 4VAAycsbPNY1bUYPPJCKQuBCtMBOdrXuJUsv0u6hj1a5eU9SHxJDPt5cb7D9sfq3dHB0 qN+zt7tyGmNuQkFdg0tDEsXz1T3k3hNrQlpeD8Ts4iHqtxIX7CL2I3tZol1Qitv6mTzO PiIEpmwF2btOTv1W4A1UlsgaiNSI8sSaj2uYGe7Eaj7hsrQGadFFj391ZPjqqBB6d7+h IU6nTjQGqhTEfZMgPhTasopo/DO0efUfUyCCbUM7lXyqFeC6SlFG+sWuqM33VnJqslba h7ZA== X-Gm-Message-State: ALQs6tAzmtqAx3vctRgd4TU6yv0v4OA1hA3ZRBnnNfUlWTmhljXa3pac BqN79nF8u6Yb2h8qTQqeZ6EG3KgwM5rl05D2AM12XVCY6Rri68hd4E3mAW7naWktkdNXCRhBEFi +uYxSyhVsIq2oCNyk3CUu13vlGfimUJFItNu8DJiALIJtulq59GNywd6eNm8aSCzBvRwj MIME-Version: 1.0 X-Received: by 2002:a24:4d51:: with SMTP id l78-v6mr3280641itb.0.1522870363734; Wed, 04 Apr 2018 12:32:43 -0700 (PDT) Date: Wed, 4 Apr 2018 12:30:56 -0700 Message-Id: <20180404193056.241738-1-modmaker@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog From: Jacob Trimble To: ffmpeg-devel@ffmpeg.org, modmaker@google.com Subject: [FFmpeg-devel] [PATCH] avformat/mov: Fix parsing of tfdt when using sample descriptors. 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 Cc: Jacob Trimble Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Jacob Trimble --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index e7c32e6148..97b1462aab 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4601,7 +4601,7 @@ static int mov_read_tfdt(MOVContext *c, AVIOContext *pb, MOVAtom atom) return AVERROR_INVALIDDATA; } sc = st->priv_data; - if (sc->pseudo_stream_id + 1 != frag->stsd_id) + if (sc->pseudo_stream_id + 1 != frag->stsd_id && sc->pseudo_stream_id != -1) return 0; version = avio_r8(pb); avio_rb24(pb); /* flags */