From patchwork Fri Oct 6 18:58:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5444 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp275105jah; Fri, 6 Oct 2017 11:59:34 -0700 (PDT) X-Received: by 10.28.10.132 with SMTP id 126mr2585943wmk.111.1507316374383; Fri, 06 Oct 2017 11:59:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507316374; cv=none; d=google.com; s=arc-20160816; b=cf6608DFeSMTi/VryUiKHgPu5lGFgahjvGXX4nHDN16jvxXLqHXC+59+fbYvkYwIna PCBVy3K/oQIq6F/8z46VG5BEed2jXrl+l5dH7yCkSR+NXSt3RpBjpHn4450fe9sDvEa7 jB5R5IJTpkvvDGRpfyw1s+KSIwH10BlE7AH9LJuOOz2/gD8mmwlTdzl46mtbbBWCrc9k rk+fm5cFZ/yxRoLrHhrBCyMJm3bBWB4u848C2j6wCa7E/+GLR90iiqukZmjBv+/AUyPp BO1xp6d7BWUzazBqLZAWT5kQ3wMyeWlenOpkgB8TT7MUePTAu64+Ojyyx1PdCEU+9tcD EFRw== 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=O85jYktcGft7+/isNdrUaDEhDIeqSvVEaNxQ5VG5KOw=; b=y55Vk4uheqCtcjaiqAHCPKu57bCmyc9h6TStNo1iwM0pFcwNL0XvQvMheFw0ZpvrI+ 5Fajw2qW2ajS3+GnQq1cm4e9ADczJs7Gj+DTF3v2ggnjkW1OkzhrLww+hlPacNJGMFgS bctFHVp4+Esn6NadZYC1qNhgRNhKwJBfzPrHavB17XciMsqzGTt2YNAfzWGS5j7Xsgge gSmCnM2HBLORu9nmH3lDmXxF/NL4ExvUUeIkTvo5t+3l9oL6bGj7nl7jsb4ZFRkXnRcO wCYYfCDTwLvx+AXR+HazJ4qQ/0O0xGErY9BaQg28a9IaFfE8cHeSQmsapvVOnluLoTx5 M1qA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PbkXMjon; 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=NONE 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 d14si1809655wmh.241.2017.10.06.11.59.33; Fri, 06 Oct 2017 11:59:34 -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=PbkXMjon; 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=NONE 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 F189A68A512; Fri, 6 Oct 2017 21:59:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AE7068A503 for ; Fri, 6 Oct 2017 21:59:18 +0300 (EEST) Received: by mail-qt0-f194.google.com with SMTP id z50so28196030qtj.4 for ; Fri, 06 Oct 2017 11:59:19 -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=ZSHmhRvUnIpdmwrvAqcVuQcceR7Jm6y9eep5uGfcFoE=; b=PbkXMjonDXTlhORnepOEgsEmM6QyLhhnncuH3Yvf3uDDJl9IHVjF603QDrfvdOnSO7 B4u0QF04eoC2dFWR/A8MRqKKKN8UCF3pGxnojlikCaI4c//zH5Tz0KqDGUtsSPqTo4u9 T80rrAqklt7tyA6B3lTI02/+Oz8mbveC9toUsk9ZepNOYINylU2GkbdPzmNN003IY0B0 Oh/SFUgiyPe20cNuMo1VM73MPXWprACFiPyoYnMWrhWBYo+b5peW4R7znIerkiRHxaUJ 7VZm9/v8PiGUFLQBunHq9FDbE/wnkLl08YwAS83MHL+XnZ2McToUhM2M1SoibHkjG6Er FULg== 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=ZSHmhRvUnIpdmwrvAqcVuQcceR7Jm6y9eep5uGfcFoE=; b=oDEr4r0ux0lLGNZdzRXaM68gWYUcluGaMzKDPQ64B/Omq6MTovdUxgqKtHqh9WOIVi 3N39+/xTDlXq72GEBWoXpkL60W0OxJs1POd8oiSNcS2/FY8soF7x6fNvaud7W7M/XVfk STVW3UhiU9LTtquqnnhsQ9wsDBrW5Qx4ZHdP8em9ajyqJVcAuWA1Xx/nVfsOyg7j+lX7 z/mgZQFFyBxWL7Updnzx3IrCFWNE02my4JBOkY4HTkU041PsZHlYaxLrM59xKmiIGaGF LwXg6z+aT66frSR2IijZP9ORn7rny/vHghAsn+ygWAhvOwV0Wu51Uq5CA1pn3yGeRorQ BRmw== X-Gm-Message-State: AMCzsaW7H5/mz1dByaFtWeLETLalGNljd5Ca6UyhA0sD2TK6bnn+WfXY LxGsOa/GXo6Y8kn2xPGMyExLpQ== X-Google-Smtp-Source: AOwi7QDSHCJzROKaa8ntl7DZ2naxokfEfPCMuG04KWYCsOl8SGny0QT9YAMG1dj3eBGszmmUND/WFQ== X-Received: by 10.237.44.229 with SMTP id g92mr4279336qtd.276.1507316358276; Fri, 06 Oct 2017 11:59:18 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id u123sm1313481qkh.32.2017.10.06.11.59.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Oct 2017 11:59:17 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Oct 2017 15:58:59 -0300 Message-Id: <20171006185859.8380-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avformat/mp3enc: flush buffered packets if referencing fails 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" Signed-off-by: James Almer --- libavformat/mp3enc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 826878eca1..c63909393d 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -516,19 +516,14 @@ static int mp3_write_packet(AVFormatContext *s, AVPacket *pkt) /* buffer audio packets until we get all the pictures */ AVPacketList *pktl = av_mallocz(sizeof(*pktl)); int ret; - if (!pktl) { + if (!pktl || av_packet_ref(&pktl->pkt, pkt) < 0) { + av_freep(&pktl); av_log(s, AV_LOG_WARNING, "Not enough memory to buffer audio. Skipping picture streams\n"); mp3->pics_to_write = 0; mp3_queue_flush(s); return mp3_write_audio_packet(s, pkt); } - ret = av_packet_ref(&pktl->pkt, pkt); - if (ret < 0) { - av_freep(&pktl); - return ret; - } - if (mp3->queue_end) mp3->queue_end->next = pktl; else