From patchwork Sat Jul 13 05:44:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13922 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 CFF37447CC8 for ; Sat, 13 Jul 2019 08:52:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A335D68AB67; Sat, 13 Jul 2019 08:52:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 980E568A770 for ; Sat, 13 Jul 2019 08:52:23 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id a93so5787316pla.7 for ; Fri, 12 Jul 2019 22:52:23 -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; bh=lb3kWq8NQkf7AQTWReYAzicbv9pzejVG8m1Jpxod1p8=; b=N7rqdMlBpV+7D0Lv79c0UeLU2hAsM6x3soFCLR7CzSH8qW2yar5UgHxaVcOn9yzyc+ t4ZnPdk+lvL6ew5++nDzgDAiFi/VZK0a5nCCgKs2pqIMDfuJGor/eEFi6cLm6PooH/iT EjmCbUxEBVxwxaYrTcoKL8UvLH9pqf4OMZtYDYjo6IojPsgnIoCTL2ba+4syDr4+op66 B0chkW54jMHAWAXN2YMKRPK0hXuqzv93/j3f78slMaM5Le+NQQzlhB5InteOi9jU6GCU 8YgC6k0zXW1uwX060aQBGCJKG5owxHUWQCoaQP1OFGUR85ZuyzX7ktTD9xY9tOfChf6R JEsw== 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; bh=lb3kWq8NQkf7AQTWReYAzicbv9pzejVG8m1Jpxod1p8=; b=XoYYK0070TlBsGyZs80zOjnVccQ4LHtfWErJrx3Vqr7IX5IwNBUMfSvMN9X/nOBRmq pj+l/vNFvaMQTA0zMyyoOJx98ok7L5yPjtb8coMnDgonsUQPQXukfL1D/cghIZD9r4bc YBOd5gcSAceOR9bZxcb2ytCi6pBKUVG3glL2T7z4yqvbV4o1oNghvW3K3mcFpRo7E5A7 kQDuxR+2ol9V169Lw5e+13K4QELzlzwsv7/UuXtixRBA2Hs+896SIurpERXRAfXz3QrZ /Pxk6UwrE1qw+iHAmab2kcxtLPTgvM7mb0LwlAeTLgIVkNjgvp+raFDBd4pspoO0ZLOr 1nNQ== X-Gm-Message-State: APjAAAUtWPeKvP3JT7iTsQR1gGdvDssth2gL/A+WcEdBq6OqwIJnOXLO gIuBXUxq/4hM9HBfqKr3ueLej6ZD X-Google-Smtp-Source: APXvYqz/LbtSSewUNjPamQRWhcI0b7ouUV3EpUTR5s0UadTlMEQZNnpvxM+1Y+5E+Q26M+Qxlav5Sg== X-Received: by 2002:a17:902:2bc5:: with SMTP id l63mr16580433plb.30.1562996649945; Fri, 12 Jul 2019 22:44:09 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id 81sm14847745pfx.111.2019.07.12.22.44.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jul 2019 22:44:09 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jul 2019 13:44:04 +0800 Message-Id: <1562996645-8212-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1 1/2] lavf/avio: remove ffio_open2_wrapper function 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Remove the function ffio_open2_wrapper, it's not being used anymore. Signed-off-by: Jun Zhao --- libavformat/aviobuf.c | 6 ------ libavformat/internal.h | 3 --- 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 6a5cd97..2d01102 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1180,12 +1180,6 @@ int avio_open2(AVIOContext **s, const char *filename, int flags, return ffio_open_whitelist(s, filename, flags, int_cb, options, NULL, NULL); } -int ffio_open2_wrapper(struct AVFormatContext *s, AVIOContext **pb, const char *url, int flags, - const AVIOInterruptCB *int_cb, AVDictionary **options) -{ - return ffio_open_whitelist(pb, url, flags, int_cb, options, s->protocol_whitelist, s->protocol_blacklist); -} - int avio_close(AVIOContext *s) { AVIOInternal *internal; diff --git a/libavformat/internal.h b/libavformat/internal.h index 399d0a6..cf8c165 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -650,9 +650,6 @@ enum AVWriteUncodedFrameFlags { */ int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src); -int ffio_open2_wrapper(struct AVFormatContext *s, AVIOContext **pb, const char *url, int flags, - const AVIOInterruptCB *int_cb, AVDictionary **options); - /** * Returned by demuxers to indicate that data was consumed but discarded * (ignored streams or junk data). The framework will re-call the demuxer.