From patchwork Fri Jan 29 05:22:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25252 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 32E7944B9D9 for ; Fri, 29 Jan 2021 07:34:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A77E68A7E6; Fri, 29 Jan 2021 07:34:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EC2F6899DD for ; Fri, 29 Jan 2021 07:34:02 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id v15so7626479wrx.4 for ; Thu, 28 Jan 2021 21:34:02 -0800 (PST) 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=3RB39mMAdkYvpoOBX1UUvrcr89dje3fnaGKoBr7MweM=; b=otB+FHhUelQ6Jd6OVY9QzWWS5sBlLeFdzngHRY2XycH1cA5sFU8eT/s3jcmmKG+wnn FsWgU6buq0lGAkSvEeEMEJuXLAAVKM+ET8xlGxYDODsz5GpQuRHcv4n3LMhQzooOhZ5c kp44Gik2xh8AQY2qlIlPsya2YxRD/MGIAep7mIiYNrBlqNmuDuARoCp5hPqfNMXyQcXe loVKJ1IEY292B2UjvSWSV7yx7Q1flbeDAjP7XyWDC90GDMTjQWm0+9seYLFTVj0D4Hpa jjGdrzJLJ1llgULBbH0SiMZi8PBGCbjHwwCCul84amIRnrpoSyyfZlQ+Ac6flySmHteS wiSw== 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=3RB39mMAdkYvpoOBX1UUvrcr89dje3fnaGKoBr7MweM=; b=JeA3z9WCoZn+OXGsuTMndIACnCffDNqYuU02iibPaMfvX1OZfSeVqQkaa6i75aFntH 6kgq2sjOQVoL4eEy5iVglJNF6IiKtGjnd3cSo2jwVxmdXkCqfm7hYR9lw8ClkgVTVlB7 9kiYN8Mp9HxmogENCYrgBpn0oAfNRD732J7c/34kueHyqnvtLIYftqzzem9ybksli/9Y s8S/oFV4vkaHxvF580MRBxDQYnQEGlrgrK3IGy9gozct0cxnTF1fVLWoSDpjWp/WpXq3 sUAnz/BNOkrfY/VunNYN6iGeZk3vFLkuFrbZHgeg+FGKOEAKIiRpkvcKJ82JfNriXb0p y4lg== X-Gm-Message-State: AOAM532vGspI6gDc2ZcoaoFyQach+z/SOSNCyC84LUXPwmBBkVg1H+0S I5JCj2R2zaoTLcrhqNUQNVKjH6vqXAA= X-Google-Smtp-Source: ABdhPJwa/R5kSTcT1pHKr8qFxi2E4wUPwTwuRseOCavKm3qiKYzEZYFIsoMMDk+NdRFjECnki/KUlw== X-Received: by 2002:a05:6000:1189:: with SMTP id g9mr2514031wrx.230.1611897977869; Thu, 28 Jan 2021 21:26:17 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d13sm10068611wrx.93.2021.01.28.21.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 21:26:17 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jan 2021 06:22:53 +0100 Message-Id: <20210129052302.3124447-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> References: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/13] avformat/rtmppkt: Remove ff_amf_read_bool 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" Added in 50468f93e3940ba78836dfdac5165c20ae75327a, but never used. Signed-off-by: Andreas Rheinhardt --- libavformat/rtmppkt.c | 8 -------- libavformat/rtmppkt.h | 9 --------- 2 files changed, 17 deletions(-) diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c index 1eeae17337..0e61e83699 100644 --- a/libavformat/rtmppkt.c +++ b/libavformat/rtmppkt.c @@ -84,14 +84,6 @@ void ff_amf_write_object_end(uint8_t **dst) bytestream_put_be24(dst, AMF_DATA_TYPE_OBJECT_END); } -int ff_amf_read_bool(GetByteContext *bc, int *val) -{ - if (bytestream2_get_byte(bc) != AMF_DATA_TYPE_BOOL) - return AVERROR_INVALIDDATA; - *val = bytestream2_get_byte(bc); - return 0; -} - int ff_amf_read_number(GetByteContext *bc, double *val) { uint64_t read; diff --git a/libavformat/rtmppkt.h b/libavformat/rtmppkt.h index eb68f1d3e1..a15d2a5773 100644 --- a/libavformat/rtmppkt.h +++ b/libavformat/rtmppkt.h @@ -259,15 +259,6 @@ void ff_amf_write_field_name(uint8_t **dst, const char *str); */ void ff_amf_write_object_end(uint8_t **dst); -/** - * Read AMF boolean value. - * - *@param[in,out] gbc GetByteContext initialized with AMF-formatted data - *@param[out] val 0 or 1 - *@return 0 on success or an AVERROR code on failure -*/ -int ff_amf_read_bool(GetByteContext *gbc, int *val); - /** * Read AMF number value. *