From patchwork Thu Jan 25 13:43:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8888:b0:199:de12:6fa6 with SMTP id d8csp81350pzf; Thu, 25 Jan 2024 05:46:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IFcabJUldL3pZXgP29+tP4W2eTGTkZQ2kMITSdWTtJnnxtxvJLcIGxGn41zglwMIlN7pPMc X-Received: by 2002:a17:906:e2ce:b0:a2e:4a46:ec03 with SMTP id gr14-20020a170906e2ce00b00a2e4a46ec03mr488435ejb.107.1706190374916; Thu, 25 Jan 2024 05:46:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706190374; cv=none; d=google.com; s=arc-20160816; b=qtoVYCiVkFkwXGyizhFa8orIZwVCQFwhcjV0pyomHXe6b5JJfI5f6gx2TphGwvGDlP M6eXZF4yz1Yn3XK5BglQ0nQM1ta937+Lghkn56EEpF1KW/bQIenFpMytUh+4tJl5dBdJ iTLZIl3qIDtsfmd7rSMBgrb0zVrdDUPK9/MVsoC9t+OIXxQiS022lcjVNXRHNRgar4M5 Hxceleim+xFjv5aCT7IzV1DeHKFPE4jKzEGpbD+e2a6Gm4OD0xkib62LUk1HVUgV3hCi 0+m+ikN6MSAYfQ9eV7jQwRm6XYY/zCpL/RY5FiYjDGB/oqXJ4kAC11GAUhN+1cjxoBeS oEbg== 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=i4F4hp723A7cMF80KBkGt5S+GPEz+t6Sdku9IBQHTbw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=s3Lp/uasYC9xwOmBMYtfQwkUk30UdHFSfjMVy508NK+hErj1T9Nf7yt6lEhIcNB01s AqVs3Ot8UZjtAzUK4w0VsKxQvsrQMfrXe8f0laBzfhotO7O2RG3dnPoJPc0IOpGCYWsk 2QGkp/M5aJ9S6lakanoxtmRY3fYkF5EDtTDIA2JcbPWJhJ9LHVzxwy5S1OcHNMUxkEOy UiXMSh7ADCuBtOSjTZdCzGk7mJcYuEbt6JMfFtqKIOHxQIxlrYGeGBtzOAR5A+NmvXV3 QTDCe9WoAwYMiGQJLkxyxzLCU2undQneUz4CjqxzreN/RUOLv0kzqYGASdHOF7TdloAE 0aZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=k9NlNgYl; 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 cd10-20020a170906b34a00b00a3173f6e10fsi627223ejb.526.2024.01.25.05.46.14; Thu, 25 Jan 2024 05:46:14 -0800 (PST) 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=20230601 header.b=k9NlNgYl; 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 3316168D16F; Thu, 25 Jan 2024 15:44:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A69B68D113 for ; Thu, 25 Jan 2024 15:44:46 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d76943baafso28824855ad.2 for ; Thu, 25 Jan 2024 05:44:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706190284; x=1706795084; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9kVQyR2un/8kXZouKJDSYHT7da1NNWMjVUcelPROthY=; b=k9NlNgYlN+wcT3WiQwarCS1eZ/F2HxQuMJfg4gRedBe4bNz2WfHQ9Nmv3r7KBfSJlW dnEJ5siQFUlmIiBm204mSOxh83WpdnbcuxQqwlbtACdrge3a60tT3DW7JTNEcztC7akb TEIJXk/3Ijc4Mmv82lvO8vQSq9UeX1LLYzp5pkGvkQLsc2oMSgezAigi3bXuZQMhcbE1 qTIAyPEdayfPlcvI2jFmugAOwVU1EQdbrOb/M0msCU8jVCddPGPC4zCRs6y/j4trSZZg rQnDaio68vT2dHmnr9/vGj/3r2cCSvruAMXc+UA5DAg+NfC/aSiS6R+klwGMrXNGR0MR rMhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706190284; x=1706795084; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9kVQyR2un/8kXZouKJDSYHT7da1NNWMjVUcelPROthY=; b=cp/WzZ162IrcSenceZTaVa4qwzq9urTpJN7TFT9mx9YWxcszmqENGJK3Wf3fk5U7a0 KrlzTy8DYe2Pgmyp8N5f6dI+ARHWJzV+uMoNFZzMOT6Z0IgMDNgsup+EMO4Ae1QsdQLV KH80+QOp+cyQTL2hRJlduLPiS8n2acOfKZOjGu5uYgD3Xjwl7K9SCd+JTofjW1GlAFB1 q/37ak/NK8JitUHOc7D6dS0d22MbTHIyeYKSg88gqG2MHfLj1mhbq5GOkkhWj9/2kGi5 F+oQY/DZJAD/Sf9Tuzenhgmhjn9OVFlTPKpRMJ+0FFrRJHLV18l+LBti7F7YGYycGhoL vV9Q== X-Gm-Message-State: AOJu0YwinoxrGD22wkfWcK+/wP0y3lLCAU0iwHPVdmQ4SG7bZOO7FfWX dG6jpvFIGEjMpAXKKw6o1paGMQ3VuCqvNGBHhhYvW4DLf2dw3HORKvgQUAx3 X-Received: by 2002:a17:903:2112:b0:1d7:5fee:beb with SMTP id o18-20020a170903211200b001d75fee0bebmr656800ple.103.1706190283931; Thu, 25 Jan 2024 05:44:43 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id k17-20020a170902f29100b001d707a14316sm11785146plc.75.2024.01.25.05.44.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 05:44:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jan 2024 10:43:33 -0300 Message-ID: <20240125134425.374-11-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125134425.374-1-jamrial@gmail.com> References: <20240125134425.374-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/24] avformat: remove deprecated FF_API_AVIODIRCONTEXT 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: 9v5S4lpiDqYl Signed-off-by: James Almer --- libavformat/avio.c | 2 -- libavformat/avio.h | 6 ------ libavformat/version_major.h | 1 - 3 files changed, 9 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index b793a7546c..6a9bd86754 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -529,11 +529,9 @@ int ffurl_delete(const char *url) return ret; } -#if !FF_API_AVIODIRCONTEXT struct AVIODirContext { struct URLContext *url_context; }; -#endif int avio_open_dir(AVIODirContext **s, const char *url, AVDictionary **options) { diff --git a/libavformat/avio.h b/libavformat/avio.h index 887a397c37..fc0d314edb 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -101,13 +101,7 @@ typedef struct AVIODirEntry { int64_t filemode; /**< Unix file mode, -1 if unknown. */ } AVIODirEntry; -#if FF_API_AVIODIRCONTEXT -typedef struct AVIODirContext { - struct URLContext *url_context; -} AVIODirContext; -#else typedef struct AVIODirContext AVIODirContext; -#endif /** * Different data types that can be returned via the AVIO diff --git a/libavformat/version_major.h b/libavformat/version_major.h index 4dfb26cca3..ee1f8bdbb7 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -42,7 +42,6 @@ * */ #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 61) -#define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_AVFORMAT_IO_CLOSE (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_AVIO_WRITE_NONCONST (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_LAVF_SHORTEST (LIBAVFORMAT_VERSION_MAJOR < 61)