From patchwork Mon Feb 14 19:39:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34286 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5803775nkb; Mon, 14 Feb 2022 11:46:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzo6vG13hrBYM8PuymtujVuf05Sfa1SvOI1VV6CEABZOyQiNmJ2A68LkIpD4iWZx19JAjvM X-Received: by 2002:a17:906:1e0e:: with SMTP id g14mr275585ejj.363.1644867969625; Mon, 14 Feb 2022 11:46:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644867969; cv=none; d=google.com; s=arc-20160816; b=ojhyF7swAasFzYYS9w5HSXpbcr5XnLXvwMWGAurOTPVkyHcCJR25E2Wq9YXWPfL/Gc krmdfi08iAN2RJ8Mg3g3xE4yvZ5oitz7/HdIsprwOjDgICMzD6jzs+WGt/XrJxqU0awH q/2Els5Af2nWtA9OIRgp0TPA85gFuOTmd/ezJlFr4xdrj5Qe9yxyVwuk1ya70rmAzfPc GvZjZNaHXSiRKinE2XZCNV5tpBL7D/fuZ4ZjQ5xFGdINhb/qucNo2xTsAkakzRe7vgjZ tW9Fp//XPm6Y0xNdEGmQmYNC77+tv+H98aylqSvvQy9S6fZBbQxvY5ll3oqedrtTWwYa kWCw== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=DNMZ/VPkIKoCVfxmfiyn9Bpn92ByRnq/LPktUdepwrc=; b=y/s0GaxmCgTKlydRsqH+oS4hytyr4vTXFJI+71maGivv1XRkBkjxvFb/JZYw026lMa aE480qdaQLPVeFC/IGL1TMMg99BIv9EjLAqgXqa2RGZ9LDpxUB0glU6aMfIc04WUPUl3 S+YbYnhjzvVyiEAfBLx+UHe0/F7OXCh4IsK6ys/qFJZ1IZw8Fv/o8wMlsBEQJZ5aK+LZ NY+gwBJWjiZhZBdAwe3q6pYHpz9VHLkDnGeWZBsSvl/4YfxGAKUok1+EOGcSwm0rrbOG sR5+L0PVQw6DuwSMD03+QirSJY3sJABS/dMR+WQE9BujLEzF25l3b25cyO73goUvKphK DbHg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hg7si7175716ejc.935.2022.02.14.11.46.09; Mon, 14 Feb 2022 11:46:09 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD0F268B1BC; Mon, 14 Feb 2022 21:46:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B1E668AA61 for ; Mon, 14 Feb 2022 21:45:59 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nJhD9-0085kg-0F for ffmpeg-devel@ffmpeg.org; Mon, 14 Feb 2022 20:40:35 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id JhCBn3LXUSgGFJhCBn788j; Mon, 14 Feb 2022 20:39:35 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=9fOdc6Alh6yYiEY7:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=0FiIzqYPJijAINhMhaAA:9 a=i1O-c8UAq6sOuJHIsowk:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 14 Feb 2022 20:39:33 +0100 Message-Id: <20220214193934.22315-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220214193934.22315-1-michael@niedermayer.cc> References: <20220214193934.22315-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJxsN5mlII1NjujWZeJ+PVELYUNGssyeAaCYx45Cu7wpsQohXB62yYf0HkzoTerI8dxZqO7RqjR4wXhNgdaUX2QSB2TpSsn1R1vQD70Bwso4QKJ92nFj 5j+TvTqRSVr0UT/v7uSAD+0to3MfqSSN6XYq/dtTTnIXcwXhjo4pa+yh Subject: [FFmpeg-devel] [PATCH 3/4] avformat/argo_asf: Fix order of operations in error check in argo_asf_write_trailer() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: w+Vl5i7FTBd8 Signed-off-by: Michael Niedermayer --- libavformat/argo_asf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 2b3569ebc3..d26844d1e2 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -423,7 +423,7 @@ static int argo_asf_write_trailer(AVFormatContext *s) ArgoASFMuxContext *ctx = s->priv_data; int64_t ret; - if ((ret = avio_seek(s->pb, ASF_FILE_HEADER_SIZE, SEEK_SET) < 0)) + if ((ret = avio_seek(s->pb, ASF_FILE_HEADER_SIZE, SEEK_SET)) < 0) return ret; avio_wl32(s->pb, (uint32_t)ctx->nb_blocks);