From patchwork Mon Apr 19 14:09:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp558749iob; Mon, 19 Apr 2021 07:15:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCBhnbDK/5Z+mJFDvcs2ePt2MCvcxzEFlF0XL6FH5QI6UqauZIkg5nxIhg1D1hZ20C41HG X-Received: by 2002:a17:906:4881:: with SMTP id v1mr3127077ejq.383.1618841711274; Mon, 19 Apr 2021 07:15:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841711; cv=none; d=google.com; s=arc-20160816; b=0sUeaWZz36DfwTHZwlUDtPYRfnRqtDEi7UucQOw7BTjI+3MuIPlOElFrvDxZ9R0SWo Ckssf8KgYGN2k2G9QpqWBbjfFGG2Do5ME5Gx1Ns8SegWbbLYB95eSLvLXVCpnoODnCoN WB+G02E8IW/U9jnNoOAzrvCBWNd8XsoeBzSfYhrapPI2o5ub1ULdfoQYR6Ylv0wN7Naz 1TDDaOjMTpXCLgqJfjG1FYn2NTew0iX/qL54OHvIgs64mLAAW8B6fLqxe92EHB0fXvDr CXCj3qjH9QkOM3xO4S5tn+P/aD9JJ4lqCECBoQmvLfzYyGZicTIDVCdA4GpCt7pqKNxa MLyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=uBS3R7haCjScD2UBuro3MEup7S4Ge4ZZgb03uGCxiHE=; b=D34nn/U7a5FN+QpPxkSaCrXkI2dhh95ZZXiMu2FPCkjwEqM2AG1xi7446sJLXapstJ qxFEvkyoGoXsmQNJPfnLcue5aQQ2z2/yT+/SDHonxvuQrFkXAkgNbVm4Fk6tL+pnlWO/ o7uPESerybiepe/t/vZXuGRKB0mBmaJoxph0w4Vjl/4GJeCJG7vHBr9IFjC4LC8FinjV dglN6nL43YRWHwvIkFQ2Ec+cXDVZPkQuA0v+hijObx/gg4GVFzy/0NBsDnfQJnxLGxlI nH4tYjlrF3FTCrqxfW1gEdHR8G2mKzl14tXw5l41m2tpQbRYZgXqRUvBGp9R11fPsQMk vpPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mPG6pkC6; 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 b19si11558239edr.172.2021.04.19.07.15.11; Mon, 19 Apr 2021 07:15:11 -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.s=20161025 header.b=mPG6pkC6; 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 B5CE7688057; Mon, 19 Apr 2021 17:11:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1939D680CEC for ; Mon, 19 Apr 2021 17:11:44 +0300 (EEST) Received: by mail-qt1-f169.google.com with SMTP id j7so26122873qtx.5 for ; Mon, 19 Apr 2021 07:11:44 -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:mime-version :content-transfer-encoding; bh=lUgZeWdK2wI5UDLFRBz2zsZEsMNqi2hrgtQ2+6HkfCc=; b=mPG6pkC6dAcRIbrxQmSoaJzWAzYMFsY3seKSTJ9EUaZjpegD3JImIwgcxRG3H0Bme3 Et2I1flDDqHUqEqbF249fUF7s6MWuaAAMCMMsUjOUwYSL3wtkEUp0BSgiHJKuy6FMcOF 94k0I76XDZZMF38qObcXyQClwZIPLADji47Y7Nm+s2CwputHkQWAALcgJCfcmrhO74r8 oO3GbMnbFEJJhMnj0kX9jaBBueEcVSem9/Bdf3VSW69Q9k7OWx5cn68hQJ7+MJDBvqtm h1xQX9Al+7GjqgcpiED7oEjz6V2PvQumCjKAcSD5MlDMmeMV5JsdnpsNyOX/BdO1+rvd wRaw== 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:mime-version:content-transfer-encoding; bh=lUgZeWdK2wI5UDLFRBz2zsZEsMNqi2hrgtQ2+6HkfCc=; b=jzk59fCLawrYcC4hNHI5ew7FsoDvFXOwznUyty6aUjTuRGlElZIugz8fvCJNMWH22m GXpekSnse2VjMVwvC0QCCqDS67RGsqxWSevYINzylcIgdvCNEpq0JJcxviholyQ4RVM+ 0Y7YRw7RRmqY2z9U/BL4KCK0/BWn8YpeD6oBQR7VLJwoSUb+opA3SkgqgqfqVS7D/5PQ o023eW3J+YvVps+mfcG4sO8lx3pEYMYur+t7W8sGHuBNThizdWD3QJrTHVtC1hjsJK/S B/4kUZxpp/Du8AscC810nfEjbRrWLSPWWRNdUJoMLmIsC+r24iyketae5IKjoCPG5asO tfaw== X-Gm-Message-State: AOAM533q325MrU/ifU+KA/KeVg3GtabeUosqi5akWc+d445armVVbCUJ yUrBx+Tp6e9vYJZf0Yz0tK183yYg7uE= X-Received: by 2002:ac8:5e4a:: with SMTP id i10mr11848113qtx.341.1618841503614; Mon, 19 Apr 2021 07:11:43 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:32 -0300 Message-Id: <20210419141024.8174-36-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 35/87] avformat: Remove deprecated old open callbacks X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GyPl5eoWl6ub From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 26 -------------------------- libavformat/options.c | 7 ------- libavformat/utils.c | 5 ----- libavformat/version.h | 3 --- 4 files changed, 41 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 578ccbd87d..14063ac5e5 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1743,28 +1743,6 @@ typedef struct AVFormatContext { */ enum AVCodecID data_codec_id; -#if FF_API_OLD_OPEN_CALLBACKS - /** - * Called to open further IO contexts when needed for demuxing. - * - * This can be set by the user application to perform security checks on - * the URLs before opening them. - * The function should behave like avio_open2(), AVFormatContext is provided - * as contextual information and to reach AVFormatContext.opaque. - * - * If NULL then some simple checks are used together with avio_open2(). - * - * Must not be accessed directly from outside avformat. - * @See av_format_set_open_cb() - * - * Demuxing: Set by user. - * - * @deprecated Use io_open and io_close. - */ - attribute_deprecated - int (*open_cb)(struct AVFormatContext *s, AVIOContext **p, const char *url, int flags, const AVIOInterruptCB *int_cb, AVDictionary **options); -#endif - /** * ',' separated list of allowed protocols. * - encoding: unused @@ -1864,10 +1842,6 @@ attribute_deprecated av_format_control_message av_format_get_control_message_cb(const AVFormatContext *s); attribute_deprecated void av_format_set_control_message_cb(AVFormatContext *s, av_format_control_message callback); -#if FF_API_OLD_OPEN_CALLBACKS -attribute_deprecated AVOpenCallback av_format_get_open_cb(const AVFormatContext *s); -attribute_deprecated void av_format_set_open_cb(AVFormatContext *s, AVOpenCallback callback); -#endif #endif /** diff --git a/libavformat/options.c b/libavformat/options.c index 07403b533e..632d450c90 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -181,13 +181,6 @@ static int io_open_default(AVFormatContext *s, AVIOContext **pb, av_log(s, loglevel, "Opening \'%s\' for %s\n", url, flags & AVIO_FLAG_WRITE ? "writing" : "reading"); -#if FF_API_OLD_OPEN_CALLBACKS -FF_DISABLE_DEPRECATION_WARNINGS - if (s->open_cb) - return s->open_cb(s, pb, url, flags, &s->interrupt_callback, options); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return ffio_open_whitelist(pb, url, flags, &s->interrupt_callback, options, s->protocol_whitelist, s->protocol_blacklist); } diff --git a/libavformat/utils.c b/libavformat/utils.c index 7d944268d3..bb0351d7f5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -122,11 +122,6 @@ MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, data_codec) MAKE_ACCESSORS(AVFormatContext, format, int, metadata_header_padding) MAKE_ACCESSORS(AVFormatContext, format, void *, opaque) MAKE_ACCESSORS(AVFormatContext, format, av_format_control_message, control_message_cb) -#if FF_API_OLD_OPEN_CALLBACKS -FF_DISABLE_DEPRECATION_WARNINGS -MAKE_ACCESSORS(AVFormatContext, format, AVOpenCallback, open_cb) -FF_ENABLE_DEPRECATION_WARNINGS -#endif #endif int64_t av_stream_get_end_pts(const AVStream *st) diff --git a/libavformat/version.h b/libavformat/version.h index de18399298..e264abd77b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -55,9 +55,6 @@ * at once through the bump. This improves the git bisect-ability of the change. * */ -#ifndef FF_API_OLD_OPEN_CALLBACKS -#define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif