From patchwork Fri Dec 27 21:14:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 17005 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 BF35F44B0EA for ; Fri, 27 Dec 2019 23:14:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A54C968AD86; Fri, 27 Dec 2019 23:14:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 76E8268ACF7 for ; Fri, 27 Dec 2019 23:14:34 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 0DD81E391B; Fri, 27 Dec 2019 22:14:34 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9ER0eG6oUJxR; Fri, 27 Dec 2019 22:14:31 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 36E2DE3E52; Fri, 27 Dec 2019 22:14:28 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Dec 2019 22:14:09 +0100 Message-Id: <20191227211411.30293-6-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191227211411.30293-1-cus@passwd.hu> References: <20191227211411.30293-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 6/8] avformat/img2enc: minor simplification 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- libavformat/img2enc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 14e6d641f9..718c9929f7 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -92,18 +92,16 @@ static int write_muxed_file(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) st->id = pkt->stream_index; fmt->pb = pb; + if ((ret = av_packet_ref(&pkt2, pkt)) < 0 || (ret = avcodec_parameters_copy(st->codecpar, par)) < 0 || (ret = avformat_write_header(fmt, NULL)) < 0 || (ret = av_interleaved_write_frame(fmt, &pkt2)) < 0 || - (ret = av_write_trailer(fmt)) < 0) { - av_packet_unref(&pkt2); - avformat_free_context(fmt); - return ret; - } + (ret = av_write_trailer(fmt))) {} + av_packet_unref(&pkt2); avformat_free_context(fmt); - return 0; + return ret; } static int write_packet_pipe(AVFormatContext *s, AVPacket *pkt)