From patchwork Mon Feb 15 14:54:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25638 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 3CB8A44B819 for ; Mon, 15 Feb 2021 16:55:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 259FB68811F; Mon, 15 Feb 2021 16:55:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3535768066B for ; Mon, 15 Feb 2021 16:55:04 +0200 (EET) Received: by mail-wm1-f49.google.com with SMTP id j11so6455061wmi.3 for ; Mon, 15 Feb 2021 06:55:04 -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=FMssZwgUT7w2b8xza12C/VrJDRV4uiZPzqhvCV6s2EA=; b=b1zRPyPtmniteqJqDqavzthJ23M4czUn8n3dYSXgQxt/uqTkEQ38JT4Z/L8nU6ZeA5 qwAzy+6Ntakz0gIHa459bB1pTjNU4joysIZsrspxSJwhXkRhKonyu1/ck7aWZ6lg3NkN So81gPSwhSKBL+gMJ+hGSRE6qKFzQcpqI/pUyKG67wguFfxViQmuEPogILT6IfxpyqRt R3tAWKMDfQTMGfwkR8AXGdfZ7qR1CYVUBgHDBxo9Tszz8aj3Cx/AcD1pxv+5Wm2kdiDX aOgIfa0JLfJ2W7XDNHvWeOt/QNvN+HtNeJ3cuUNoHnMav1T8khsW6i9ltqFBMpe1paZR 3kLw== 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=FMssZwgUT7w2b8xza12C/VrJDRV4uiZPzqhvCV6s2EA=; b=h2b5S34QGuQXxAbb2JDcwiF86FKqZOMDwOddjoRzM6yLRUUqBI8kyuF7bKed8jCxb9 sBYGbYKxwYI2HNT3riX4HbUOvqF722N9AZxQh0T2EOIu1403eBZjMBYPXcAd9y0tgkGE wlruU56WadiDu4OUCAAEclzB/EWccq/EvIO95PgkDupJ+Ng1HXvN9nFEElAQLpnsylY+ BpUTMTplAfHWcxEpOHkvIHtPXqgUs+Rq5S56T9HTwAz46alKLSfWKOOYCkkJRtsyF1hn SiM17lcR2pvIFNhcwngZIRrFMavxOw1PFMl+HVzo63vpFBdPqF3FtwQsO7ZZqi1ftwmx Faig== X-Gm-Message-State: AOAM530Dj/ym8X7Fa2BLQbBuxvPPY0IJvRJLvG8O7O4jq/bfWRYlIkNt 0CFd4xmx4VtrDTKsTuDNGbOo4+buNSk= X-Google-Smtp-Source: ABdhPJw8KrF4DhW9d7BKi8o1zuL03OOYTon04s2y6k7rgKqSZ7ne1pp/OSGG65JThYnknL8+lxXJew== X-Received: by 2002:a05:600c:4f56:: with SMTP id m22mr10748481wmq.143.1613400903535; Mon, 15 Feb 2021 06:55:03 -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.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Feb 2021 06:55:03 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Feb 2021 15:54:23 +0100 Message-Id: <20210215145423.591629-3-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 4/4] avformat/mpegenc: Forward error code 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" Signed-off-by: Andreas Rheinhardt --- libavformat/mpegenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 14b904b152..d37f181eaa 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1151,7 +1151,7 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt) StreamInfo *stream = st->priv_data; int64_t pts, dts; PacketDesc *pkt_desc; - int preload; + int preload, ret; const int is_iframe = st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && (pkt->flags & AV_PKT_FLAG_KEY); @@ -1207,8 +1207,9 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt) pkt_desc->unwritten_size = pkt_desc->size = size; - if (av_fifo_realloc2(stream->fifo, av_fifo_size(stream->fifo) + size) < 0) - return -1; + ret = av_fifo_realloc2(stream->fifo, av_fifo_size(stream->fifo) + size); + if (ret < 0) + return ret; if (s->is_dvd) { // min VOBU length 0.4 seconds (mpucoder)