From patchwork Wed Jul 4 18:35:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Coudurier X-Patchwork-Id: 9617 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1079169jad; Wed, 4 Jul 2018 11:36:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpes1+zCbPqqzZFaOlxVRdOrJb5LBJCeggCjVrw4NZQtVFEtHVCVoqEvOFioIcNTz6t8Q2E8 X-Received: by 2002:adf:820a:: with SMTP id 10-v6mr2298536wrb.144.1530729386719; Wed, 04 Jul 2018 11:36:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530729386; cv=none; d=google.com; s=arc-20160816; b=nZ6sDJ7AexYv6y0eE15yBqrp1Ov7Ry/UggEJtwryP0cKHM3E4qw74As4Ht/sNEJPCc Qw0onK4w66IN04wvaE1PSx0Wvz33/sjS8EPS7o57ZxmhXew2OPTsg3Ukek8ewV1KyIzs 9v1YrfnzTOChMZtEPCNN2btSFNBQjqsVJtYgQuqGPDOr1kEkAHvb0gPAuWwvuZO7l0OS ulaAEU8OoewXkEL5N9zw2YKsjQVGxL2qjD9R/vRSK27ymKpRFJnXzSU9wah5dx+eacD2 FKRGsiV1c/yPZpVat2BNQnzWSuVtqPDb5x/wTA/DrT9AZ2saFFSXKw5mIBFZ5GTdhmx1 POXw== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=cbZtgTRALbniGESmG8wfW6YNHIre7g1G+7IQ9fKfooM=; b=D7rbTuBvN6JwtrLImYLEEEVNTiwK5wiw1kcZ8OtnX2iVGMrlCYu6I/F9GgTQ2XR65C zqPuUepF6KJgHlvzO0N/j1+uV6gm2Pk6GNsA/FtjmX81bd+7KcvbarME3KGb53ug1M3b 3C6tuZuMeAj+HI1aXf1khIy7900uVSJctG0Guv7DIK1Esa9X3xKIS3NkEmaCE0zrtQCc 0m5X+Pe2YnawYn0aSDDLg6Ldr5ZZwvjzODlUFvYtgE2hnFVzahM68ZnzkLDe8N6agZe2 q+i0P8QABWKCSAVrBjdfdzU/xih1LnEuKC73r6nlSCgstJFUPvnhVNUMnonjtZJcTc70 Km2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vCbVpx47; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n4-v6si3578616wrp.237.2018.07.04.11.36.26; Wed, 04 Jul 2018 11:36:26 -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=@gmail.com header.s=20161025 header.b=vCbVpx47; 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 sp=QUARANTINE 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 4882768AB45; Wed, 4 Jul 2018 21:35:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f176.google.com (mail-pf0-f176.google.com [209.85.192.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 005DA68AB2B for ; Wed, 4 Jul 2018 21:35:19 +0300 (EEST) Received: by mail-pf0-f176.google.com with SMTP id v9-v6so3254407pff.9 for ; Wed, 04 Jul 2018 11:35:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=oRiW0gArWYBpZ5GP3+ZQwlo/4am4r4HN4L8oIzoDUDs=; b=vCbVpx47fyMTvLF5x2CgTG0AmpZhUSmIctTZXtDz9+BuVSiTofwM+uEWKV0O2gtCtI yyyXScXEYGcRUw/8fdEpeU9y4p5+2vE34T0ZkPZxMn4mE+vP/tJpSkzwn8flRgKxkmJC nlhEPh8YAQAyzPX03/JplfzGRjF+URNuaU57Tu2ahS03PpA4fvaXeod4/4/+HfbSqdEE rWz+tmx6S2ppcACNeaL3vBsf38PIGwhdWmgWlj7+lREhPnhBCzxSNJpr9/dhOrsN3BOn LcqsHCewEzH9WFbbvQiQ09Gn8Z9rEaauHLTTXDVJnLif8I58Pd5BIgwwIq6EWJE5/aa+ wO1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=oRiW0gArWYBpZ5GP3+ZQwlo/4am4r4HN4L8oIzoDUDs=; b=DCOU216uOkPelFEw+COPVG1GKZC9DqrxoRbYP9b2raipQaJ2uOBsJXu2LAdVspUaGI lDmWE0+w6pBgomgq2THXvRfvjZf2TQw65t4NwcXFVa0hJ39drVqy+imMjS+n//1s2nNk cE34/4copXm+WPyZIH/eyMY3oTG+oBy517Uxg63gMr+TKyKlLcbeGU3sUJaXubT8rgh1 plE4ey0fYspUU0vAM9ED9FUqDhLN83TI+/22XpSRP93G79jo+gsiCSCMtDfyitwjL3I8 GvM/EpPpUnRDIaElC2eqh54XlhN7phb1Q4tx3d6wHwEH0dcMGfd78LEcfLYOesfNZh0X +vmg== X-Gm-Message-State: APt69E3zyvYHeISo/ND7QZZqzlusxBRDtatGmsC1kvYXgO3BtOjLRu+L sX0F/0RJmyVyeTD5NpVWtMrn1g== X-Received: by 2002:a63:c312:: with SMTP id c18-v6mr2808244pgd.449.1530729322726; Wed, 04 Jul 2018 11:35:22 -0700 (PDT) Received: from localhost.localdomain (cpe-104-173-251-254.socal.res.rr.com. [104.173.251.254]) by smtp.gmail.com with ESMTPSA id v126-v6sm8591239pgv.39.2018.07.04.11.35.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jul 2018 11:35:22 -0700 (PDT) From: Baptiste Coudurier To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jul 2018 11:35:10 -0700 Message-Id: <20180704183514.71654-8-baptiste.coudurier@gmail.com> X-Mailer: git-send-email 2.17.0 (Apple Git-106) Subject: [FFmpeg-devel] [PATCH 08/12] avformat/mxfenc: fix muxing when audio tracks are longer than video track 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" --- libavformat/mxfenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 1f272ce6e5..036adce011 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2935,6 +2935,9 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket while (pktl) { if (!stream_count || pktl->pkt.stream_index == 0) break; + // update last packet in packet buffer + if (s->streams[pktl->pkt.stream_index]->last_in_packet_buffer != pktl) + s->streams[pktl->pkt.stream_index]->last_in_packet_buffer = pktl; last = pktl; pktl = pktl->next; stream_count--; @@ -2942,9 +2945,6 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket // purge packet queue while (pktl) { AVPacketList *next = pktl->next; - - if(s->streams[pktl->pkt.stream_index]->last_in_packet_buffer == pktl) - s->streams[pktl->pkt.stream_index]->last_in_packet_buffer= NULL; av_packet_unref(&pktl->pkt); av_freep(&pktl); pktl = next;