From patchwork Mon Feb 26 03:19:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7739 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp924094jaj; Sun, 25 Feb 2018 19:25:38 -0800 (PST) X-Google-Smtp-Source: AH8x225cwizEj/bAqcG1rZ0/yqZFwNfeLVrHdmiyUzKAut+jzA4/atNV6ubHiQRcENu+ZnfO68DD X-Received: by 10.223.163.157 with SMTP id l29mr7752880wrb.239.1519615538426; Sun, 25 Feb 2018 19:25:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519615538; cv=none; d=google.com; s=arc-20160816; b=yzdaHZkBGfcWyzFFbKXWPsYWzarAa969+XwDjgvuAWu3UnUHibchZ6BXZBW2N9FGhB CdjMiYqKhmGpzpI90u8YhJ1n15f8tGU1lN4brXkKmqBudmztM45Oc1SdQqgTIFD/5pug UOKOL6ioeV79FLDE4LsWgQxmjNiFCMLLQHG7WBKjTE6eSuev1lyUVQ+vIhXFHQmGst/a z8t8xLbGS+f1JWpSLTcVWI+mgzIToN6hsn1Zmy0WjsF0aq1nWKlQIWe58Q8k/yjexwx5 T6G9n4k78cE+VelxzDJpl4/3E4kmvWYb7AQm9rm5SuUd0qIun2F55YN/MAwsWX1Y5N9k 18ww== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=5oFvbPGjWPViyYnhLmJPMaiurfnsGUVStpd4hzIngz0=; b=y4iGCjgcfqBwOAvozlb71UKaFulc6VbPQ5SgEZGyMmeJp0xVMU38kHaQORbFdbsKdX JDvdel0sSkLMDI+zXaefk96ZlhLcHy5WKGjH6VI1ESG/hQjztDSb1B9oWVaTghnG+VGq 49cW/E20LyFv8D7yZ6KlONykzzTvRloHN5Gd+MfdrB+hMoWxM6UfYRqglvnxTD6cIrPu tUf3SM+UJOsvfv6VILrZKaAY3zUVVzeNj+zCtD/En/XE5yRjNBrPNeBL9Q+NeAW4R5F7 lK5wE4sR1En2khssWjU8WvJiw1B/e6GsUmbmZmUzQWl3DPPfADWVXy4j/lpKKrs9VHKD a6Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HEOqqWUn; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 93si2629363wrp.334.2018.02.25.19.25.37; Sun, 25 Feb 2018 19:25:38 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HEOqqWUn; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB7B168A2CA; Mon, 26 Feb 2018 05:25:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1AA968A283 for ; Mon, 26 Feb 2018 05:25:24 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id y137so17484905qka.4 for ; Sun, 25 Feb 2018 19:25:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=2vf+Gf9lRj8BIvTcPTNkeS/4ejvE5IAMvjodcGxwAj8=; b=HEOqqWUn0triGTON18gA3RY7wRcQFjZapdMbaNntMH25sFKh+fSU44WQ3MDtoLzVXy 2qCMngvhkimOQl5M9oE5tHjfWaVuHUZ19bQwJSbBSotAmnuvsEC+dH0gO0uplmsls94F smirBQAHS7mwLQW7knjE5kCCgylIoxhpcor2s/AGxVzha3qrZLcZfOKINvOZGeHgkxZc mDkC1uDRCwCRhxnRBAOxJ8pxrJcxNNg9ERQvp0VWJGsv1WHcSc6v4aldgNQE6pegn+/c tr81bFyzuuf4gxxE1gESWoEAOZWoykH+rD0Ofv59djQBF5bdbEKd8S8heFxHsrn+PDts J2qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=2vf+Gf9lRj8BIvTcPTNkeS/4ejvE5IAMvjodcGxwAj8=; b=Q2M3MRNvuIep/5AOcJ6wuDMZOOBKGpySEJI0q7HeZ6UhYAlnasa4tdq62QUx+teLIQ DPRPBJhzAhz3U38axuL6Ckg2miA++tht257bfxEK1PTdtg95cgUV1SEIIu9L2RGL2Fwc jhDzeHLuin704juwnPXjCHKy0styV2dxyvAAwwEmri8E/CddCtj/s1NrWelp+03am/K+ GMu3bchohPBsVy+G/PfKUHmk/3gWUMVKr8V+fPV34TNQ9W83GAT54lQ2JoqR6MSdx86E ztnQ6sq90jFknn6jDpz2dp6LfwKDOed++CwccNFMm5Q3BcdYj7nIvxa0goO2WVNIrd7H pFuw== X-Gm-Message-State: APf1xPBkLAV0pOmsaz9xV/btCXycPJ5EkH+msmG1NrgLt17tkxIR12mL fPfynWkAelsrZ+zHwJlcTyRksQ== X-Received: by 10.55.42.229 with SMTP id q98mr14181513qkq.150.1519615203511; Sun, 25 Feb 2018 19:20:03 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id u16sm2737422qke.97.2018.02.25.19.20.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Feb 2018 19:20:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Feb 2018 00:19:19 -0300 Message-Id: <20180226031919.9156-1-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] avformat/utils: don't overwrite the return value of read_packet() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This only affected demuxers that didn't return reference counted packets. Signed-off-by: James Almer --- libavformat/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 2c2ea876b6..72531d4185 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -869,9 +869,9 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) if (!pkt->buf) { AVPacket tmp = { 0 }; - ret = av_packet_ref(&tmp, pkt); - if (ret < 0) - return ret; + err = av_packet_ref(&tmp, pkt); + if (err < 0) + return err; *pkt = tmp; }