From patchwork Mon Apr 19 14:09:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27049 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559058iob; Mon, 19 Apr 2021 07:15:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmagwnRRe7bTGXEfJ+nScglGvi5zcNjzi56KHXGaCOrbxv8zfGCAMKyoF+RSr7WkeVA5dV X-Received: by 2002:aa7:c391:: with SMTP id k17mr7930006edq.153.1618841733447; Mon, 19 Apr 2021 07:15:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841733; cv=none; d=google.com; s=arc-20160816; b=J0ski0SlGq/dcDMuh4+NQ5z95V95bibmKgrhYSR8OEX59RRww3CodXCWeB6XCirPGq BWfBtQ1O5V11u3HqE5XI/oks7531l23bDzQYI6u5UlB6zH7e3xARd1sd2FdqWHFjLC+M s31s5B7bqtiTCbZLOu2pnL6TXrKSJyM7n7JW9hXp7aGtrS/NryvP9jAK8egaSfXLxvTL 2KDS//lIY5lsP3yvlCGarnllrx5iHp8K6oEVT2TxF3Y6p3J4OgrrMiGm5vPmVJ+nPmzW z4YTUkuMah2O2xPXqJNMeRaUkz1gjMzaubpP7B1vP6oJzZ8jCd5hHtwxTVTdKatB829/ 5jqA== 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=sRadedS1Io75lvTv+uCZ3PkRq/AgQ0uot6k8DUWH2DI=; b=Jx8DTpq1oqykVkl4cqgnp1GKR8SYNDZ7sF2mUOwv6P96HPNEAqe+p9u/hEnJ5zuuy6 9gAQasiFU/v1AsC5255bqx1VMK44WPyk8KXCC2/jVMO/mvNeuGtGBQje+Z0x6frMcth6 5zO4iruJEl/olBX508Pos/vHn3jfPu+YoGZB0e0bJGcrqZH+XDH/dpb6gAXCfZfpp+Cw Ls6h2YUSjAQYHQ8lxxYxXmD0KHtlJk5vzDmIc8gY0h1UZtT6IPFn38YzaWRIr/6oCKZQ kXgSbHYFh3C8k2s7vnv+XvMMBQ8WiEiMz8pOIFqAM1LMmqkY/xTUrl8RkqT/ioS/6V+R mFgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=irQnee7G; 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 g1si12018381ejw.615.2021.04.19.07.15.33; Mon, 19 Apr 2021 07:15:33 -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=irQnee7G; 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 73EDD6881BB; Mon, 19 Apr 2021 17:11:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEBCB687F17 for ; Mon, 19 Apr 2021 17:11:47 +0300 (EEST) Received: by mail-qv1-f50.google.com with SMTP id i9so16741450qvo.3 for ; Mon, 19 Apr 2021 07:11:47 -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=iOGKooxSjnJEvy2E173i6JjXSyt17z0HUmWgs/OBkOA=; b=irQnee7Gc0sQqZJNp6h3pbKU4D+yZIY9WaDrUEntanpCzrfuUV5bwQEjc1mdBnmoFG ycDTsJeYgCC4QNL7vjw3wICmGPJQzk7IGJYuji9tIKC6d/Ay7xhcQx0z8QQBJmni1QaS V3PimB1fis3dW3xM/o2fSICThVoBYrONp26DsRCrCf2i7mbaOGSrra2A5UyGhdeQ1WOG 8TGzjy10R8UWoB5qMrW3DcSPCsesIjugS7qLO5kczx7nbfN2FZozlbUn1PlfjEj4spqO TO1lb0TDLpOQ1mBrtHs8uJXUQV+EwFrZNEqNcSpdLtEcgdy2xa8LL9/iI0Lr0hGnhptk vj/Q== 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=iOGKooxSjnJEvy2E173i6JjXSyt17z0HUmWgs/OBkOA=; b=OR4G6CU8BHcDMwZHnFwoV+ETUCblKunJrlME/KzKcdgL4eciGiOZPrpFDPSDrIsmVL b+6VAf62Wug1Hhzy/fUlUK6YSwu0k7T8S/SoDJnNbQ1pkGD0YUsZtBAHw9Z4fYROygEl ufVDtg6lxtiFx6O/l8RZwNrskwVNFGlJYfX71R32MpCdlvqx/qHlUly3mi+wmCv8woh/ o2JZ1FS+MH325SNtwUNCpGUsna1LxYt059/iZlcHQ1o6/+ZrN4Uh0dbigJTYQR2Brwn5 /o3s4yB7wo9W+IVd3pYvdS+MoE9eUZL6fRCe8P7N0GO1A1Xy7/jBAU/DsYP1t+Wc1ULn ItnQ== X-Gm-Message-State: AOAM531zlgHHUqHnR2mYVmtt/nZH+XuZaruxu02GEvnUFP8OwvD0YceV wrKg6iSukFclhXK3bY5IjQkzpshinkc= X-Received: by 2002:ad4:4ee8:: with SMTP id dv8mr2746697qvb.46.1618841505873; Mon, 19 Apr 2021 07:11:45 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:34 -0300 Message-Id: <20210419141024.8174-38-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 37/87] avformat: Remove deprecated filename field from AVFormatContext 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: CRf03Mu9p9my From: Andreas Rheinhardt Deprecated in fa8308d3d4f27d6fb38ac2069887a7b259f1c6ab. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 13 ------------- libavformat/mux.c | 11 ----------- libavformat/utils.c | 10 ---------- libavformat/version.h | 3 --- 4 files changed, 37 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d629eaae5d..d0cc12f931 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1255,19 +1255,6 @@ typedef struct AVFormatContext { */ AVStream **streams; -#if FF_API_FORMAT_FILENAME - /** - * input or output filename - * - * - demuxing: set by avformat_open_input() - * - muxing: may be set by the caller before avformat_write_header() - * - * @deprecated Use url instead. - */ - attribute_deprecated - char filename[1024]; -#endif - /** * input or output URL. Unlike the old filename field, this field has no * length restriction. diff --git a/libavformat/mux.c b/libavformat/mux.c index a05b55b53c..1c08c74b90 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -175,11 +175,6 @@ int avformat_alloc_output_context2(AVFormatContext **avctx, const AVOutputFormat s->priv_data = NULL; if (filename) { -#if FF_API_FORMAT_FILENAME -FF_DISABLE_DEPRECATION_WARNINGS - av_strlcpy(s->filename, filename, sizeof(s->filename)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (!(s->url = av_strdup(filename))) goto nomem; @@ -247,13 +242,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) (ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0) goto fail; -#if FF_API_FORMAT_FILENAME -FF_DISABLE_DEPRECATION_WARNINGS - if (!s->url && !(s->url = av_strdup(s->filename))) { -FF_ENABLE_DEPRECATION_WARNINGS -#else if (!s->url && !(s->url = av_strdup(""))) { -#endif ret = AVERROR(ENOMEM); goto fail; } diff --git a/libavformat/utils.c b/libavformat/utils.c index 3643a83632..d8b44ce896 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -547,11 +547,6 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, goto fail; } -#if FF_API_FORMAT_FILENAME -FF_DISABLE_DEPRECATION_WARNINGS - av_strlcpy(s->filename, filename ? filename : "", sizeof(s->filename)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif if ((ret = init_input(s, filename, &tmp)) < 0) goto fail; s->probe_score = ret; @@ -5800,9 +5795,4 @@ void ff_format_set_url(AVFormatContext *s, char *url) av_assert0(url); av_freep(&s->url); s->url = url; -#if FF_API_FORMAT_FILENAME -FF_DISABLE_DEPRECATION_WARNINGS - av_strlcpy(s->filename, url, sizeof(s->filename)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } diff --git a/libavformat/version.h b/libavformat/version.h index 67dbff5c56..e0cf9e6f3e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -76,9 +76,6 @@ #ifndef FF_API_OLD_AVIO_EOF_0 #define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_FORMAT_FILENAME -#define FF_API_FORMAT_FILENAME (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_RTSP_OPTIONS #define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59) #endif