From patchwork Fri Jan 29 05:22:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25245 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 5A2E6449EBD for ; Fri, 29 Jan 2021 07:26:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DA4A68A70F; Fri, 29 Jan 2021 07:26:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B1086808F1 for ; Fri, 29 Jan 2021 07:26:20 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id m1so2929959wml.2 for ; Thu, 28 Jan 2021 21:26:20 -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=C08tFWzKPber90B0KY8BMwzXe9yLCyPeTXmtudl6g4Y=; b=XXrzbHrukYRJ7KJxjggA6AGfPPjzw9Qk+XPLk88jVzgpMza81aljs5MVTlyMZLqXDE y3Obak7Gh5ALjzXhKoHRvrday0elrOXbtz5RAfVArNCvOS0oK41vcFlkon5f7qXCHUei qeG4ub/ZkXz4qbKaTmdEPlvixkAnpzoaPlbOLsWX6e1KsTWiEZSD7aRhyVmMVNA+h4sP NFt+ekFcfE0bKmrsW9aYUGhRI/RxadAj/XRIDHvBZ7sjmNzkVRmCXdz8C4UVUvj61Ca3 hGFgWSp21zKY+qa6LpEdHnc95aPTplJr2rjm42yt0S8WTUKH2YKxI9SJurWHylJcnSPd Tj5w== 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=C08tFWzKPber90B0KY8BMwzXe9yLCyPeTXmtudl6g4Y=; b=Dr0CXTIT+dieCPMvqkXdiub2U99H0jAowp6IQ5HgCO06MWeBk7/EJO4fUAlwg+KZmC 0EjiCpwscL2jzP7oUn55Rys5CgoGOXu9PVAOQNG8Ebe4xZBuks1QE5Tcv7F2IuJtICKU rbAN6E8becwESrxNIBkp/Eektz4zD7F3p7EXx7LPF0FWa6Gh0nNBN+5S/POtyE5QwYX0 lmMxtDnJQ6zF76fQvD3WbYc87PoPFR+kSfaAbZiKuRL06crNiOVmZXd1Bob0djeXBA58 TD79Ya/tVf2/OXwaNqRG/cEZ1FPxxlwJh3cOaQXsUE9CjlC/+OfbFgVJlUEz7XZObf4Y JPVw== X-Gm-Message-State: AOAM533F+h5t0uY4QsfqblQAirVDCCMON95OqBN7rTU1P+j+6wPMH/z+ ZkJCNMQBJTilk3pMLY0AkJ3DGDycG1E= X-Google-Smtp-Source: ABdhPJxsRixl/jQTrn66GAQx5lXOf5CqItiaqgPuAiJWWGVxJxDwcspZBdYRDAJ1Rd3VaXWVyQtUQg== X-Received: by 2002:a7b:c08f:: with SMTP id r15mr2141821wmh.22.1611897979761; Thu, 28 Jan 2021 21:26:19 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 21:26:19 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jan 2021 06:22:55 +0100 Message-Id: <20210129052302.3124447-6-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 06/13] avformat/avio: Remove ffurl_open 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" It is only used in commented-out (and nonworking) code in async.c. Signed-off-by: Andreas Rheinhardt --- libavformat/async.c | 6 ++++-- libavformat/avio.c | 7 ------- libavformat/url.h | 7 ++----- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/libavformat/async.c b/libavformat/async.c index cc11ec47a0..5a81507ef1 100644 --- a/libavformat/async.c +++ b/libavformat/async.c @@ -612,7 +612,8 @@ int main(void) /* * test normal read */ - ret = ffurl_open(&h, "async:async-test:", AVIO_FLAG_READ, NULL, NULL); + ret = ffurl_open_whitelist(&h, "async:async-test:", AVIO_FLAG_READ, + NULL, NULL, NULL, NULL, NULL); printf("open: %d\n", ret); size = ffurl_size(h); @@ -688,7 +689,8 @@ int main(void) */ ffurl_close(h); av_dict_set_int(&opts, "async-test-read-error", -10000, 0); - ret = ffurl_open(&h, "async:async-test:", AVIO_FLAG_READ, NULL, &opts); + ret = ffurl_open_whitelist(&h, "async:async-test:", AVIO_FLAG_READ, + NULL, &opts, NULL, NULL, NULL); printf("open: %d\n", ret); ret = ffurl_read(h, buf, 1); diff --git a/libavformat/avio.c b/libavformat/avio.c index 3886ed7a90..fbe07e44bc 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -354,13 +354,6 @@ fail: return ret; } -int ffurl_open(URLContext **puc, const char *filename, int flags, - const AVIOInterruptCB *int_cb, AVDictionary **options) -{ - return ffurl_open_whitelist(puc, filename, flags, - int_cb, options, NULL, NULL, NULL); -} - static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, int size, int size_min, int (*transfer_func)(URLContext *h, diff --git a/libavformat/url.h b/libavformat/url.h index 1ef5ca35d5..f13e851a14 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -56,8 +56,8 @@ typedef struct URLProtocol { int (*url_open)( URLContext *h, const char *url, int flags); /** * This callback is to be used by protocols which open further nested - * protocols. options are then to be passed to ffurl_open()/ffurl_connect() - * for those nested protocols. + * protocols. options are then to be passed to ffurl_open_whitelist() + * or ffurl_connect() for those nested protocols. */ int (*url_open2)(URLContext *h, const char *url, int flags, AVDictionary **options); int (*url_accept)(URLContext *s, URLContext **c); @@ -148,9 +148,6 @@ int ffurl_open_whitelist(URLContext **puc, const char *filename, int flags, const char *whitelist, const char* blacklist, URLContext *parent); -int ffurl_open(URLContext **puc, const char *filename, int flags, - const AVIOInterruptCB *int_cb, AVDictionary **options); - /** * Accept an URLContext c on an URLContext s *