From patchwork Mon Feb 15 14:54:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25636 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4192B44B636 for ; Mon, 15 Feb 2021 16:55:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27295680466; Mon, 15 Feb 2021 16:55:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03EDD68065D for ; Mon, 15 Feb 2021 16:54:54 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id l17so6479351wmq.2 for ; Mon, 15 Feb 2021 06:54:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=YQHAwG5w+iohSxZ3Ofp71x78LJ6K6r0mGIbwynlbgLs=; b=uJZ2wA1NWtZA1SLC2O47gO/Yldq6kMO8uReYO9SwfDQ8ufLShZTXrQLWtmLXAqO77J sei69uXZZWmeLXphX1A2ypgjwzjNq9/EyGZbNwZIYKJkVrCglfBFAg5bivPEr6eDXQeo ATCWO1ne2FP0ywZtn7qnIL/sbZJ4JHCEWkOk4nLh/Y7fIbDQlyOJ37qG7aYMbo7YZcHi rIoML2EU/yLOwh6muxLcUdCkA3RWkzHdBr2F3S/g302eD/K3mKCKQgabChItwyA7Hx5g wNKOfO0L9fOLpo06BemWZk5BbHWM2RTCeNSUlHQRhQxe3X3uSb3E+yG1iSeU9aTdzpla v9fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=YQHAwG5w+iohSxZ3Ofp71x78LJ6K6r0mGIbwynlbgLs=; b=CJ+NrcceDpQltAdePPypSYO2lXE//onPKQ5dhuX7eBe6hreV0+SxA3TDq4I0/uCgMA yRiCBIq7Te1Dt5w3NFLKeIoNY4ul6lOnlkCAu1/BfnMWx258QAlKhDKl+QdkR8mm+0Rc VnOho6kE2m/q4bTOOnWa5iMOdtfGUxHcEGGTOQfHvmX1KGCo5Mp5PTbZYKuHwUXNKCZt 4uGQyLMJV9eNfF2Lue58garG7XwZvwYfrYc3JnKZ9IFOORBOFZl1axDqN4SzmDUFS+fc K4Qplt+2omqR4KEgOj16UnuCg8CXLYYNRrJ8HHPrADnluVq+NL07OK0fD0PJHqrPZlNO hZZw== X-Gm-Message-State: AOAM533la7IfZNXN2alKzJ1x++zJe7h/y2F3PZ6Wxc6JrqZjXnBhH9fn IVttYNAP08FUXfHMDM3VUH8xWHsAbRQ= X-Google-Smtp-Source: ABdhPJwjyNL1qkJd3OKRfrQgzkDXUGWsZHmIrba2Gdi5M4uQtdfgOIr1xTfmvgKRZ7EFkc6mEd1R8w== X-Received: by 2002:a05:600c:3502:: with SMTP id h2mr2136535wmq.107.1613400893346; Mon, 15 Feb 2021 06:54:53 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id t6sm14835694wrn.96.2021.02.15.06.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Feb 2021 06:54:53 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Feb 2021 15:54:22 +0100 Message-Id: <20210215145423.591629-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210215145423.591629-1-andreas.rheinhardt@gmail.com> References: <20210215142505.514125-1-andreas.rheinhardt@gmail.com> <20210215145423.591629-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/mpegenc: Avoid adding invalid packet to queue 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Do this by moving the check before the allocation. Signed-off-by: Andreas Rheinhardt --- libavformat/mpegenc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 1204e57f04..14b904b152 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1179,18 +1179,6 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt) av_log(ctx, AV_LOG_TRACE, "dts:%f pts:%f flags:%d stream:%d nopts:%d\n", dts / 90000.0, pts / 90000.0, pkt->flags, pkt->stream_index, pts != AV_NOPTS_VALUE); - pkt_desc = av_mallocz(sizeof(PacketDesc)); - if (!pkt_desc) - return AVERROR(ENOMEM); - if (!stream->predecode_packet) { - stream->predecode_packet = pkt_desc; - } else - stream->last_packet->next = pkt_desc; - stream->last_packet = pkt_desc; - if (!stream->premux_packet) - stream->premux_packet = pkt_desc; - pkt_desc->pts = pts; - pkt_desc->dts = dts; if (st->codecpar->codec_id == AV_CODEC_ID_PCM_DVD) { if (size < 3) { @@ -1204,6 +1192,18 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt) size -= 3; } + pkt_desc = av_mallocz(sizeof(PacketDesc)); + if (!pkt_desc) + return AVERROR(ENOMEM); + if (!stream->predecode_packet) { + stream->predecode_packet = pkt_desc; + } else + stream->last_packet->next = pkt_desc; + stream->last_packet = pkt_desc; + if (!stream->premux_packet) + stream->premux_packet = pkt_desc; + pkt_desc->pts = pts; + pkt_desc->dts = dts; pkt_desc->unwritten_size = pkt_desc->size = size;