From patchwork Sun Mar 22 03:47:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18320 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 08E8A44BCD9 for ; Sun, 22 Mar 2020 05:48:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E582F68B479; Sun, 22 Mar 2020 05:48:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E2DA68B370 for ; Sun, 22 Mar 2020 05:48:29 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id b2so12265451wrj.10 for ; Sat, 21 Mar 2020 20:48:29 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=QYTGd0sieNKm3BUB6bPmyWu6r1Zz839doYRWHo41ZtA=; b=OOybiafQKwO8F2zLf/hwMuUu8BflaW3EiJ+MJUi4vp5h0QtiBgilFAeCeEhFNpdQec pqFQ49oV76+pgbY29hCqG5jcgCQG2o7bFI7LLDpKJB5uNKdQRQKihRUbdVv6m8iAH8AM sq9O1AFAZO1EwmZmqOoJWA21K/qya3HQo0zQIeuPZxHlsVSvugpm+K9evv3xnX1J5sK/ 9GzuOEi7qTkz3U1FcL4K5t3eCogI1k7Psv7v4Y7Ejw1l/vefcf30SQZVjEI426h9sQBu Zoz3FPMgxYdKFiEvocHNuopYE8+FxoMKGckMdM3nhYgprGL9ItcxIiPuSUFN9uHKItCZ +yeQ== 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:mime-version:content-transfer-encoding; bh=QYTGd0sieNKm3BUB6bPmyWu6r1Zz839doYRWHo41ZtA=; b=gPsME1jdWZkuXytMN5b6pD9uDoNPCfuFBXxhNYAJil/+sai6kkv6413vdp7dM0PVMa gD6L7eGA7oJpE2Ezc00LhKctgMAUTWShRupY/XUi/Kp6veGlTNCpkBzGWsdS4T7LenDN 7Cil1QVInvohUz3PNiHAUBfI/SktqGaVcfKnZTpzUbTXRJ9R350w2o58oViR41kbULh/ Gp9+uBES1Q2PuqvG5B/AOQYS03MdyEeP2tSQi4jTPdL9M0y6cNQ0mx1bEYbP9ghwj+A1 HyI89NHuYIzSLOKOpgBzaovK864MrFvPbeTCJWiOH16+0QjvWLV6zvVR48NPMz4M3Q8j /m1A== X-Gm-Message-State: ANhLgQ141aA5Ip91Yifywi5iOypeiuQpfiIDFFhwd3+eL70uiUrJK3yK MVGl1yOtbImXHxpUOeBUiPVok9uI X-Google-Smtp-Source: ADFU+vtt9zHyTv1QB8iKyQ3S2GpH8DjRy21DbYqvRw5EzLl8VM5UqEVtUrY2RwfaD8wAuqA7Ae9KHg== X-Received: by 2002:adf:d0cf:: with SMTP id z15mr21874681wrh.357.1584848907326; Sat, 21 Mar 2020 20:48:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id k204sm1530371wma.17.2020.03.21.20.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:38 +0100 Message-Id: <20200322034756.29907-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> References: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/21] avformat/mpeg: Remove unnecessary av_packet_unref() 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" Forgotten in 6a67d518. Signed-off-by: Andreas Rheinhardt --- libavformat/mpeg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index fad7c7fd55..eba5852266 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -961,7 +961,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) { if (pkt->size) // raise packet even if incomplete break; - goto fail; + return ret; } to_read = ret & 0xffff; new_pos = avio_tell(pb); @@ -978,7 +978,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt) ret = av_grow_packet(pkt, to_read); if (ret < 0) - goto fail; + return ret; n = avio_read(pb, pkt->data + (pkt->size - to_read), to_read); if (n < to_read) @@ -986,10 +986,6 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt) } while (total_read < psize); return 0; - -fail: - av_packet_unref(pkt); - return ret; } static int vobsub_read_seek(AVFormatContext *s, int stream_index,