From patchwork Sat Nov 5 00:50:37 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: 1307 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp101882vsb; Fri, 4 Nov 2016 17:50:51 -0700 (PDT) X-Received: by 10.194.29.161 with SMTP id l1mr13800195wjh.97.1478307051323; Fri, 04 Nov 2016 17:50:51 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g82si8168811wmc.54.2016.11.04.17.50.50; Fri, 04 Nov 2016 17:50:51 -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; 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 6D3F5689E0D; Sat, 5 Nov 2016 02:50:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B4B7680A9A for ; Sat, 5 Nov 2016 02:50:36 +0200 (EET) Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1c2pBv-0005od-6R for ffmpeg-devel@ffmpeg.org; Sat, 05 Nov 2016 01:50:39 +0100 Received: from [192.168.1.3] ([80.110.106.171]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id 40qd1u00p3huFGY010qfuq; Sat, 05 Nov 2016 01:50:39 +0100 X-SourceIP: 80.110.106.171 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Sat, 5 Nov 2016 01:50:37 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201611050150.37926.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH}lavf/mxfdec: Search all components of material track for source package 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 #5925 here. Please review, Carl Eugen From c928270086e6021fba7d6d3201be7ea569e37253 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 5 Nov 2016 01:48:10 +0100 Subject: [PATCH] lavf/mxfdec: Search all components of material track for source package. Fixes ticket #5925. --- libavformat/mxfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index d2166ee..c687ce5 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1974,7 +1974,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) source_package = mxf_resolve_source_package(mxf, component->source_package_uid); if (!source_package) { av_log(mxf->fc, AV_LOG_TRACE, "material track %d: no corresponding source package found\n", material_track->track_id); - break; + continue; } for (k = 0; k < source_package->tracks_count; k++) { if (!(temp_track = mxf_resolve_strong_ref(mxf, &source_package->tracks_refs[k], Track))) {