From patchwork Mon Apr 19 14:09:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559221iob; Mon, 19 Apr 2021 07:15:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLL5yZ6VpTuYCpn+ME3c1r+V3BmoFNiFb3CRkl7QdFU+1J+FVhGu6exp9Q8Ck2+VnC/LHL X-Received: by 2002:a17:906:b2cd:: with SMTP id cf13mr22883423ejb.419.1618841744584; Mon, 19 Apr 2021 07:15:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841744; cv=none; d=google.com; s=arc-20160816; b=Dv02mbZNK9bBSnBBy0VmEQU+Z1UojdijiFFMWEfmRmTs9QUK5gKnzranUuvs5K/9ks N92A5pwkenccvY3RwIPl/1PqWFGfg3FZr46mo+YMHLFqZ3rWAojNMJPnVu21IZ6wrOgk R8fAMILawzt6YUJ2M6x9G8U8F5s4Ux1XA48iFXtaiDz5wuwio7iJoLHU3TA+BUsp6UKM Qfr6nsLM0jEG0SbUUVtB0qu+fGFvMym3OG8ZQ6qcSA81fSAVQH5r7RELaulPIwaRfUkt 1euaOMT5bENtJtCOCtxrmlYLAnzfZzox8VSnYczG01oobyLnd3HK6b5aoIs2+eYCSI75 K0yw== 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=i7jX+E7bxOXAcO9FODhMWWljMMyrQpxVve8Syw+2kB8=; b=pm2YiMBGmjvOHP7ovpBVU/QTWLOtOSPBFNGPsf96nbRO3sOZE2l3M5b91SitKLf1Xc /LBINR0mWWwMFmMrE0uePRKhRASMQuDyF5HvwJeURklEJTsNGUeDTYwUbwxkIN7JFLEM QleuKkDAMoCujyTkauhrclaSmhdLynQajyDyQu8bOpQf94QCJi14xKCJ7sZSZ+9+Yx7m gXM4Wg9PEoTwce27tgaPcl/veBvj5ARilh6kw/Tsp/RwPfcNysalVjfbU7DlQMGVP0T2 hEeBxsvfCGoUaT6fi6kXpRXRqZdKbUHndMytRDpaJyNlR1hh6Un4Rdm7mDVUKFQwszbt /3pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QLSw9EcQ; 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 g23si12716196ejr.602.2021.04.19.07.15.43; Mon, 19 Apr 2021 07:15:44 -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=QLSw9EcQ; 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 72D1B6881A8; Mon, 19 Apr 2021 17:11:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E279368812C for ; Mon, 19 Apr 2021 17:11:48 +0300 (EEST) Received: by mail-qk1-f169.google.com with SMTP id d19so134692qkk.12 for ; Mon, 19 Apr 2021 07:11:48 -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=uTBi2k9QzlI0oO58KR0kHXM1NsayT7MkO1ks1kQZAiI=; b=QLSw9EcQDLkfTNl2v/KK4IrEMoT/A4ngIgNAxrGCeVWFXIyE9aBFFoBeq17+XabPJX MNUCA65aPUwFr2WGEWJq5rLVcznU92VPvmT3DCKMpkG569oNAxOdUcJiokxDb52yI3ps D1ahs2Gu1NsMe2de2zhSL2iyRFDh8wTRnk9M+idUAqfNBY/fdL7zl2lt1e7prDIqdG6D IMFeUqdiP0mLJKiH2vrxYJxvnaVIt2IRHQQa6COZ1k0fVRYcEpwDPmtdZ1cWW+3fbtwL 6YRcN9+k4zzBpCwGpW85hms47KzylipyaVhOZaG1B6tk/h5WVTSBNne0q4agGvN61aOO G78A== 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=uTBi2k9QzlI0oO58KR0kHXM1NsayT7MkO1ks1kQZAiI=; b=pX5rRrGrESm3gkEPBhBmNq+76RnELxO25abwgIFq8IHDX6TRwBYkA/Tz1xXfakld0i 9huBQ8U+pur7YPCMmR8DjdCZXrjMEO1BM0XJIkflAbRZyPuEaZWCPJYWwK5E2Wp+Z5mv IZarpN9YE/dUnHK11QBi436NxLAFZRXJc0W3NVdqkIAOUchmai7ULUYqhsIaXF0zSpXE SCrYDuWnE6MMs8uFA9MaI+KnhehRwT5XqwsqRpnwpYy2k5AjL7BtqnKsuzY49m89hx8K ytScLlQp/9eihrUUkx3CZ8gNE6AXG7aKo0uPeRVWM1L6lNBzeNXfWq1i18VDIkfh2lVd DgKQ== X-Gm-Message-State: AOAM531dTefI/Gly0KBjsSUqFHtcsL1f2PeqRiGjNFKDYxpjup8zHd5K MSaoRK++4TXuhBvEHAuJfwBaGTB5bUE= X-Received: by 2002:a37:2ec4:: with SMTP id u187mr12418147qkh.472.1618841507534; Mon, 19 Apr 2021 07:11:47 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:47 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:35 -0300 Message-Id: <20210419141024.8174-39-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 38/87] avformat/avformat: Remove outdated private fields 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: CO7uphVsiKgH From: Andreas Rheinhardt Affected function pointers (always NULL) in AVInputFormat, AVOutputFormat as well as private fields of AVStream. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 47 ------------------------------------------ 1 file changed, 47 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d0cc12f931..093084221a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -578,18 +578,6 @@ typedef struct AVOutputFormat { * @see avdevice_list_devices() for more details. */ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list); -#if LIBAVFORMAT_VERSION_MAJOR < 59 - /** - * Initialize device capabilities submodule. - * @see avdevice_capabilities_create() for more details. - */ - int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); - /** - * Free device capabilities submodule. - * @see avdevice_capabilities_free() for more details. - */ - int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); -#endif enum AVCodecID data_codec; /**< default data codec */ /** * Initialize format. May allocate data here, and set any AVFormatContext or @@ -755,19 +743,6 @@ typedef struct AVInputFormat { */ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list); -#if LIBAVFORMAT_VERSION_MAJOR < 59 - /** - * Initialize device capabilities submodule. - * @see avdevice_capabilities_create() for more details. - */ - int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); - - /** - * Free device capabilities submodule. - * @see avdevice_capabilities_free() for more details. - */ - int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); -#endif } AVInputFormat; /** * @} @@ -1021,11 +996,6 @@ typedef struct AVStream { ***************************************************************** */ -#if LIBAVFORMAT_VERSION_MAJOR < 59 - // kept for ABI compatibility only, do not access in any way - void *unused; -#endif - int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */ // Timestamp generation support: @@ -1055,16 +1025,6 @@ typedef struct AVStream { enum AVStreamParseType need_parsing; struct AVCodecParserContext *parser; -#if LIBAVFORMAT_VERSION_MAJOR < 59 - // kept for ABI compatibility only, do not access in any way - void *unused7; - AVProbeData unused6; - int64_t unused5[16+1]; - void *unused2; - int unused3; - unsigned int unused4; -#endif - /** * Stream Identifier * This is the MPEG-TS stream identifier +1 @@ -1072,13 +1032,6 @@ typedef struct AVStream { */ int stream_identifier; -#if LIBAVFORMAT_VERSION_MAJOR < 59 - // kept for ABI compatibility only, do not access in any way - int unused8; - int unused9; - int unused10; -#endif - /** * An opaque field for libavformat internal usage. * Must not be accessed in any way by callers.