From patchwork Thu May 31 00:05:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 9172 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp4929593jad; Wed, 30 May 2018 17:06:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJOX62Nnl6EesEj3lfDLdf3I6ZoJ4YMWr1p/cUfLEB7K6k9db6VjljV1Zqhl2je2iRQJcbb X-Received: by 2002:a1c:ad05:: with SMTP id w5-v6mr2809063wme.28.1527725176057; Wed, 30 May 2018 17:06:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527725176; cv=none; d=google.com; s=arc-20160816; b=ZQAA7D/fPyvTaPyMUo8ivFg6cq6M+SM98eT0YGBTZtMixo2RpJZeZzkZvSiQJhYxVQ +xHuUJz9fO50mDUxX0mazabewXwQuSly9Pdkj/3FKC5+X6qPhzIn1J9wRyz2mgjnMJUV cf4121VlU+sYM2YK/Hx+BxkiSO3pmkC9CytU1vqy7MyZMwMrMON2n3CNZkWgvo3qRAm+ TXVAUTrK+lF3wfj0ByOfY5tai2hzT2p/Z1gTdiH4hVli20a7Xpcgf7smS8y00fI8MMd3 taBG/IrTsZ250XjF+0vPSAggr0WU+FPAwEBAPfHlQ6x8763mEAYs7TWeoIiQbUwtSuCY Qd/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=5O1QYj3r/wXC26D26AUbK1EH/VD6AtlLkmqd6EKQkRY=; b=qWNQxZMhuz3w6ivLUnXIyL/MKGk3QvuUjb8iviVE3YzSiPslIxAlDVKBFfZtBud8fR eqZs6oKF60pPbvnB8/OukLES6JgYrlHp1pQrstVTbnVgZ2y3FiTa94jmUnm15f3uoknh 9cFoQmQ42cySLH3u2tYB6fEAxty8bkISH/Ws44mkQgwYHKXo7DrlU3GLyop1cHXRWs01 gy1UryIsPU1fnp6I+/WjTzUwexo9mEykwiYSwu8V2Hozdxl8uLdd5/Rp2vfgPTWwzjzO aqmWrmJoreo7gnzx/moXV4WWFQHmuS8XtGJJbJtx+7b3eU8yXMXrng+h74OE7A3i8zu6 iN/A== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p73-v6si16791040wrc.51.2018.05.30.17.06.15; Wed, 30 May 2018 17:06:16 -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 B5F8468A457; Thu, 31 May 2018 03:05:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78DBA689E11 for ; Thu, 31 May 2018 03:05:08 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 50E71E1157; Thu, 31 May 2018 02:05:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XDRSifEEFJCR; Thu, 31 May 2018 02:05:52 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 34264E06EA; Thu, 31 May 2018 02:05:51 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 May 2018 02:05:34 +0200 Message-Id: <20180531000536.11482-4-cus@passwd.hu> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180531000536.11482-1-cus@passwd.hu> References: <20180531000536.11482-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 4/6] avformat/mxfdec: remove check for NULL MXFTrack in mxf_set_pts 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It cannot happen for video streams. Signed-off-by: Marton Balint --- libavformat/mxfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index e80ef62d57..cf1cd71987 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3221,7 +3221,7 @@ static int mxf_set_pts(MXFContext *mxf, AVStream *st, AVPacket *pkt, int64_t nex if (mxf->nb_index_tables >= 1 && mxf->current_edit_unit < t->nb_ptses) { pkt->dts = mxf->current_edit_unit + t->first_dts; pkt->pts = t->ptses[mxf->current_edit_unit]; - } else if (track && track->intra_only) { + } else if (track->intra_only) { /* intra-only -> PTS = EditUnit. * let utils.c figure out DTS since it can be < PTS if low_delay = 0 (Sony IMX30) */ pkt->pts = mxf->current_edit_unit;