From patchwork Thu Mar 12 17:54:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18137 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 B0F1E448A93 for ; Thu, 12 Mar 2020 19:54:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8661F68AF5B; Thu, 12 Mar 2020 19:54:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D30868AF32 for ; Thu, 12 Mar 2020 19:54:20 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id m3so7371875wmi.0 for ; Thu, 12 Mar 2020 10:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CnBa8Jtx//ZCHuYyV+OhtFaf2Mo1YbL0DexeXjJqjGw=; b=c4iV8AtN/uXIsNEoQSiYj7DYeNRctlAS6Wyb75dprnbCS5Dm9FLOelUox9CHOC5nJE 7NOmiPHc0NxojCIQ4KCzxi+6UC9QzlJ/GPnZbABIegLWvqfzi42kvFTCq8PkKCYr250m EmiELSyW0jtyXmLtvH6rngExq/s5YPai5oe9l7vowhanK44snZvwWXTuvSE59mf89TN5 1wJb90urw/8wm3eG7joNCQCEENoDgX8EywsOjIpXawMGROJlvnVxchtmNLJJ3IgpykLt OD3ORpsywHs+Wjete3XX/7e3sD208DzkKjJ52ywr7G9clmcso0MWoe8SiJy5U2KyHgYu Mgfg== 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:mime-version :content-transfer-encoding; bh=CnBa8Jtx//ZCHuYyV+OhtFaf2Mo1YbL0DexeXjJqjGw=; b=lZDigQr2mAktUK8U49JtDmllqDWqSkg6MR4MiwZ4nMpya21QssT77ef/jF8PcHIqVX Y3JZ9S+uxP1/q0knxMjjLZdmtVNXKsQ9CaBNLGWXGz8P9q7YTz5ti+g8Mg6T8L5YCD/1 VSBa4xLDU96m4QopgdeZ/4+aL2nPahu60xB8GWQXLWkAMiTDzro64esqj3z+U5wwSNJU 7FN3I2LTG0An4r4CbmnliqVrstRHP8Xps1STO8lXLL2TBOo/SP0YGpA4MFuhcQwF3QBP qbsHxKhwAfyQBxvZp52eTgouTh0QnXuiVl7d1EabRBgJ9ISo0g+Nuefx7k7gb0FTmPZq h4vQ== X-Gm-Message-State: ANhLgQ0yOkLUFIz8Zdyk6DaIgH+Gv36qojGfQSuJ5WWORECy2ZV2h38v PiFCYJdFcjZ9zbekmhco1iCIPUgN X-Google-Smtp-Source: ADFU+vsyViRrXvug7J9gopncjoQEPMvUHXokmm6wZMUuHOm9PstYU6MpVMehcr77x4FbFoctHCAWkg== X-Received: by 2002:a1c:4805:: with SMTP id v5mr5752771wma.98.1584035659369; Thu, 12 Mar 2020 10:54:19 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id h81sm407577wme.42.2020.03.12.10.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 10:54:18 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Mar 2020 18:54:07 +0100 Message-Id: <20200312175408.31391-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mux: Remove redundant checks for write errors 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" If writing a packet didn't directly return an error, the AVIOContext's error flag is checked for errors (if existing) by write_packet(). And if write_packet() didn't indicate an error, its callers checked the error flag of the AVIOContext (if existing). The latter check is redundant. The reason for checking twice lies in the FFmpeg-Libav split: The check in write_packet() has been added in 9ad1e0c1 in Libav. FFmpeg already had the other checks (since aec9390a), but when 9ad1e0c1 was merged (in 1f1c1008), no one noticed the redundant checks. Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index d88746e8c5..bc2eab0c96 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -913,8 +913,6 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) #endif ret = write_packet(s, pkt); - if (ret >= 0 && s->pb && s->pb->error < 0) - ret = s->pb->error; if (ret >= 0) s->streams[pkt->stream_index]->nb_frames++; @@ -1246,8 +1244,6 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; - if(s->pb && s->pb->error) - return s->pb->error; } fail: av_packet_unref(pkt); @@ -1274,8 +1270,6 @@ int av_write_trailer(AVFormatContext *s) if (ret < 0) goto fail; - if(s->pb && s->pb->error) - goto fail; } fail: