From patchwork Thu Jul 6 18:28:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4240 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2526798vsb; Thu, 6 Jul 2017 11:30:59 -0700 (PDT) X-Received: by 10.223.128.80 with SMTP id 74mr44114894wrk.9.1499365859184; Thu, 06 Jul 2017 11:30:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499365859; cv=none; d=google.com; s=arc-20160816; b=dsqXWh6daMfJ4w5amNYW8G5sOe0GUX626WiULfHdXAZtF4EEMkuXPLGx6RnT3d2Y3h 2rWZvhM4Cot3HvcQuPL8SaxI0m34CdVgQ0CxHYymgssNGmyDAb3/f0mYfaXMsMAkxUFZ oP1pyUeihl881KlYlRRs2gf1S3aU/JUi9Qpxo8LgyeJl4czWWi6uJo2fSf+J7jeWeg2q L9QnpJ4m/SxzQrjWoSDWRarHqZM5A1aVV6wE3x0R4E/A+KoE6cmQ8mKvNjFQTclcbZE3 P/qEqasn+dR71cLFlyUzHiTmQOpsqB0qJ6ZL0CpusNaMwAGSZCsjavlwfZ94/bXW+MjK Lh6A== 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:dkim-signature:delivered-to:arc-authentication-results; bh=pPmP+7mT46hENYAjKPU1vENjxCR2tlTZrYzG4qRqQ4o=; b=R/vywlMeLpwivep+8iNnCYnjQCcfJRAom8H2f81+JsVfJztD7HYb4RcEE0HrLecDra sGlkEZE3JxQACxpshCtBzdTyfylq3axCcs9nRd2MW4Tv01HOHyEn+TsXBCA1tDdhUGOr sPzElLcR8jnGhxitXJe0RLjPHKys+1o1ClTxMy8ngyNbqjBWzLoXB+Aju81cZkb85WCE L+feFiXeGhiVMWvcntExdPkO5Yglnxnoo0C2mUOegaMDBmpM+CGaL5mJF0JcKgNn3wds gL3YCUPgDJskEDl3A52gf3oTksQxaLz75V7fTBUq+LgfjpjmRi4BZFN+adKVcKMCMYZ8 V/HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=sN5LKn6Z; 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=NONE 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 a6si497641wra.276.2017.07.06.11.30.58; Thu, 06 Jul 2017 11:30:59 -0700 (PDT) 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.b=sN5LKn6Z; 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=NONE 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 23F196899A8; Thu, 6 Jul 2017 21:29:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1CEB6898DC for ; Thu, 6 Jul 2017 21:29:38 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id x23so2318105wrb.0 for ; Thu, 06 Jul 2017 11:29:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=q2mqOP0wEux00EQjtQgmkfllIm9NPulW2ScRWQ7QBlo=; b=sN5LKn6ZZ6f1wECSY3IiyWgj3PJfHV+nD4YLEjNL7XTuMrn29B75QHXLv9rhYeNRCJ 1imWeylz8bk9DA1eCgjo6bihNEaKu7L2Xbf/j0B2LDvhhsK/Gv53gzxmjAk55EVIQuCa QSGGUtL0eW3cXlOFHsTN5kuuGHU0Hk8oSN9zL/nvVuKgdLzhCEtVHJHCSI0fcK90QQ7I Hsgz8hKODykPIDswO43deJ2DMO2OlO09p8IKPlsQPMtbLtn3cULaZDuLdti4s3L1zI8X vKNOu0jjg4+P/M38hD3zgyjWjwE9zfqlA2fLoqi/3WjYePIfw0fdoeQpgedNy784o/1G W07w== 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:in-reply-to :references; bh=q2mqOP0wEux00EQjtQgmkfllIm9NPulW2ScRWQ7QBlo=; b=cZ9jdmAdnowc59d1acaMWrufjCxwBJJSVSqmjCsrm209nAUpDHVXuRdSYq4ikMSEC0 k8tIW5Y0Ii04kcHg4gnf116iF8QRpC7kZPVnAy7gvQL1C3lRn9+OgrffXZhjeJj24m9u SVinqBlTvhn72gvuS9SPAT/JsGXtg1zYNKdbN+bB9GhuEFzBkrzOiQVVcriBZN1pNplh 1s+WYp+uLvzFEi49AJAvoYuerhc963WzlzDFTv6tuIIwad0MGyLgvTZl726rejQCTrkw eXZp9pFZjpf0pvjUeNL5m9Md+BfPQQH7DWLkj1Xe8ocrqcGXDhqI37kKB4MJl6KVt7dT QE6Q== X-Gm-Message-State: AIVw111a6p7nreyiK+XVO2Btd6bsDq1mNbm6K9+fCb8/cbsLBnts66nk 9qxzcIwH9+q9G91Wgas= X-Received: by 10.80.141.83 with SMTP id t19mr325289edt.75.1499365781231; Thu, 06 Jul 2017 11:29:41 -0700 (PDT) Received: from localhost.localdomain ([62.208.38.79]) by smtp.gmail.com with ESMTPSA id k49sm1371108eda.45.2017.07.06.11.29.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 11:29:40 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2017 19:28:39 +0100 Message-Id: <20170706182842.7785-10-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170706182842.7785-1-derek.buitenhuis@gmail.com> References: <20170706182842.7785-1-derek.buitenhuis@gmail.com> Subject: [FFmpeg-devel] [PATCH 09/12] rtmpproto: Fix error return 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" Mistake was added in 5840473890440dbe0bd2cce530ebb3d93e187ae6. Signed-off-by: Derek Buitenhuis --- libavformat/rtmpproto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index ae55a33284..7dd9cdddaf 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2507,7 +2507,7 @@ static int get_packet(URLContext *s, int for_header) } else if (rpkt.type == RTMP_PT_METADATA) { ret = handle_metadata(rt, &rpkt); ff_rtmp_packet_destroy(&rpkt); - return 0; + return ret; } ff_rtmp_packet_destroy(&rpkt); }