From patchwork Wed Mar 14 02:35:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7966 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.176.11.4 with SMTP id b4csp1470451uak; Tue, 13 Mar 2018 19:37:26 -0700 (PDT) X-Google-Smtp-Source: AG47ELufXdiR5eznZn3M7kds+ggoPe2NLUw838RIswBizLWsWLOKYoZbejHNAcD/EdSGOmrr0kAj X-Received: by 10.223.185.73 with SMTP id b9mr2341470wrg.229.1520995046500; Tue, 13 Mar 2018 19:37:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520995046; cv=none; d=google.com; s=arc-20160816; b=jdw23WPbAQ42ef5+D85jP/F0tuBYq9F/SwK3506r5I5UcwkUY8ib5KLTP+8cDgmZ4d qwJrXYXPgMZkr+WouJ4owidWzqlDYtrtoEdrHeRQo140DBahiDPGkrC1OjHO1ud7XseU YosB2oGEUWFT1FYm/OfY2QaHaqiC0uyGQLZfNTFcNMdEDmwhT4rO4hSUawLNvVrqcgRl qH1L7wpWEUEMfn77kdDALRPtcTUrodnRl11ujTWqu4C8hD8gtPshLS3FZAEef4WFxot7 YcSMjlLXTDIQbgFJQtFMLNbmnILlnA3KVSW7nsCbYaBBWGCcQBAhc+tpRJKaE3R9n5M6 6dOw== 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=zXnKqIs4EcnzLPcoByV+U5C+b51BY5hlIrCjsmS69Lk=; b=ptLFvK+6ZqjGNtXJm9Fszl8KFb/jr5546QFiUvNluHcBQ0DrYFkUfbqKTxuUHNLBgP jijnA5DFMukLzs/d6O6zJ4QALb6dra6Or+r2qia/T+mEYlHtDMk7vnhPm1XKjRjLMX/F SkYiuo8tHXbd0l3igygJGX7iHyShtvxGRibPLyO2r1F9bGlKpbhEwTm9oX6DZMyWzVm7 fkiMJ1H7YFAjTRkQpHoY8GRJyCit9bTBdT8pImiPO5DHJH3bGaBiOzvMYj1f92bWyd1u cEXQcPhhv3eAnpjpDRqzfU/PTwnYSv7vpz5Z65JQUtMdtGcXhA3OZ5QU1RWcviqWSwoN dIhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vUJMhs+J; 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 a7si1073565wrc.520.2018.03.13.19.37.25; Tue, 13 Mar 2018 19:37: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=vUJMhs+J; 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 2EF2F689E50; Wed, 14 Mar 2018 04:37:13 +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 8AB39689B63 for ; Wed, 14 Mar 2018 04:37:06 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id v124so1926832qkh.11 for ; Tue, 13 Mar 2018 19:37:17 -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=Q8AZY6G81bNYSbhF3sTzBd2IZpa48n8YvURDY5jhkjc=; b=vUJMhs+JQrV6k3Y9KeNMUuxTcI5ZwpWp9G36h+cNUSX1njDUTTV5EtHD+ZDtWJ622e lbeUYuJLHGfttFV+I4qEP83EKD4rRlsZp9o//aMjIYGi813c095aSVo7fAJ23INsavxd YSHStJP+Yl9fRWGaapRRGXESQfbRcB/O5pu1Vc+C5GnlFPeLPEyXHYBYscvGwiVVO2FC TWrgswo4c1xsinJbI6qoK3i8s/ol4PdDOEFdv372AuGR6tHoqfYeII9e98m0Afm2KtYm AVd+4BrOmZONF7VMz51eftUwFDqtBwNvUIX/v67fdYOn7n6zeNAl5+FqDInqDNNVJYRP hc7Q== 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=Q8AZY6G81bNYSbhF3sTzBd2IZpa48n8YvURDY5jhkjc=; b=YUKxt8oTR6nHhewkiHVLzLOiUedKdrmxN8ZQhJdQMqHPGUJCrlr6Z6QIDx18utJg/c dchY/v/Sn4i3NXkknqH68S+4pqc9HBlObR+TFC5BFgwaAdnT3cqYgPmJPrxaM1UNWNgF M4dD57iAsb401rHpyAV1jm1pr5w306ID9fQzU8aRhJBRVsh60ZMIqs2Oc+/NSMCqDFtD xTCiSXWPkZwTXe5sqdENG7OxbgA9I4HahovpfanEFpAcGrt7ZBqO6tXCcKMsW/aQJJ1N xuO/8p9UA12Fo7N3yh00ATaID8cBKKN2w/nnT/XR0x8uNgaz9U4H8T3lESsvsQaKv/TL ZdYQ== X-Gm-Message-State: AElRT7G0BZcvS4enbA0e81GwEvmAlkfERkmPlKViSxVyyGRoCkEIdcUl RKsRNPvnyQGshL76UYVD9Y0z4g== X-Received: by 10.55.95.133 with SMTP id t127mr4206642qkb.273.1520995036514; Tue, 13 Mar 2018 19:37:16 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id v41sm1256201qtb.78.2018.03.13.19.37.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 19:37:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Mar 2018 23:35:18 -0300 Message-Id: <20180314023518.5960-1-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] avformat/movenc: move the concatenated eac3 packet reference 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" Simplifies code. Signed-off-by: James Almer --- libavformat/movenc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a17bb85900..df6163bae5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -491,10 +491,7 @@ concatenate: if (info->num_blocks != 6) goto end; av_packet_unref(pkt); - ret = av_packet_ref(pkt, &info->pkt); - if (ret < 0) - goto end; - av_packet_unref(&info->pkt); + av_packet_move_ref(pkt, &info->pkt); info->num_blocks = 0; } ret = pkt->size;