From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id 1446F45284
for <ffmpegdev@gitmailbox.com>; Mon, 16 Jan 2023 13:41:26 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EAF3568BE0D;
Mon, 16 Jan 2023 15:39:31 +0200 (EET)
Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com
[209.85.210.44])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A424268BDC5
for <ffmpeg-devel@ffmpeg.org>; Mon, 16 Jan 2023 15:39:25 +0200 (EET)
Received: by mail-ot1-f44.google.com with SMTP id
p17-20020a9d6951000000b00678306ceb94so16122721oto.5
for <ffmpeg-devel@ffmpeg.org>; Mon, 16 Jan 2023 05:39:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
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=kwnBD9pfSuAg2fHyrcc2HHrr1utmPm23BJidvu3tESI=;
b=lLOTpm3zetblj4ItTOVaUC1ANGCZ8cmCChifHlAXjd2C7GpmJW9z6+ci9HncTdf5Tu
MBO7PRfEK8qm4ZIuKWKcRpgI30oqhO0Y7vg2t31dvxwhV1TyOn21CvIdIps64E5z9taN
TSzIHYcHJG/x3lRI7zTUrKaQi2JGGdXQ2nY0qqkbGs9yx9Ap6Ym5zk/sNMufqI2J8/pd
H1yGB6zcroVI5lPkJIZTf3WGlv9kFfEkkVasZntWQ5IUE5HL5p61CawZ3uYMVFw2u8Nr
bh5vce4JJYtqb8bwVCUyPZ0Cfg7MWwZmzfwGkf58VjD5/dSaQtvPR0Ywann5guYUGwX2
h5uw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
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=kwnBD9pfSuAg2fHyrcc2HHrr1utmPm23BJidvu3tESI=;
b=ktFq+83F5QAhAMAVVLm+ru+tGfkJxYgcYw8K849pJ79jzSSpmwqTIwfJ4sioiic4Pb
BdgDwVj/JUes3Dx20uZBpUjbSUZsfW4kbsR1v1539bVGgINaujqCen1g5COIkjYHIzuG
HmmADo8gafG7VtN6TH0UVHygz/GxHkOIkH0LChk+0bwLYKX4GOYSw48oVUhQIAZhaxpI
ArD7rZcrzCtarr9yvuxKOtyyNbP0u4oML/Jd1adUnoUp+6CrcmYd/vQBEogNO79nc7yH
aT4zdWGiGPkqwuJjqM1VGitNbcpHJggZFKjz8LPJ2elq8KF5DONWv1AYIECwMQNeH8d1
tcqw==
X-Gm-Message-State: AFqh2kqNyZE7dretP6SejVZCCh1EP65+CUgB8k/NG8cKUATAFoU0fK+M
he4o479yl4CCN8FVDGivcazuNAlSJKY=
X-Google-Smtp-Source: AMrXdXttSMjm5M64+BQmMlzCs73v1OrMprLs5RqKVVGySv65y7oYGT+DxJIZFcgBfJOFdJwqHkg2LQ==
X-Received: by 2002:a05:6830:12d6:b0:66e:61e5:5b50 with SMTP id
a22-20020a05683012d600b0066e61e55b50mr9663262otq.11.1673876364033;
Mon, 16 Jan 2023 05:39:24 -0800 (PST)
Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar.
[190.225.105.197]) by smtp.gmail.com with ESMTPSA id
3-20020a9d0303000000b0066ca9001e68sm388524otv.5.2023.01.16.05.39.23
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 16 Jan 2023 05:39:23 -0800 (PST)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 16 Jan 2023 10:38:28 -0300
Message-Id: <20230116133840.512-15-jamrial@gmail.com>
X-Mailer: git-send-email 2.39.0
In-Reply-To: <20230116133840.512-1-jamrial@gmail.com>
References: <20230116133840.512-1-jamrial@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 14/26] avformat: remove FF_API_AVSTREAM_CLASS
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20230116133840.512-15-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---
fftools/ffmpeg_mux_init.c | 11 -----------
libavformat/avformat.h | 2 --
libavformat/options.c | 3 ---
libavformat/version_major.h | 1 -
4 files changed, 17 deletions(-)
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 9eea8639dc..4d4521f639 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -1709,18 +1709,7 @@ static int set_dispositions(Muxer *mux, const OptionsContext *o)
if (!disp)
continue;
-#if LIBAVFORMAT_VERSION_MAJOR >= 60
ret = av_opt_set(ost->st, "disposition", disp, 0);
-#else
- {
- const AVClass *class = av_stream_get_class();
- const AVOption *o = av_opt_find(&class, "disposition", NULL, 0, AV_OPT_SEARCH_FAKE_OBJ);
-
- av_assert0(o);
- ret = av_opt_eval_flags(&class, o, disp, &ost->st->disposition);
- }
-#endif
-
if (ret < 0)
goto finish;
}
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index b40492703c..daa396e5a2 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -948,12 +948,10 @@ const char *av_disposition_to_string(int disposition);
* sizeof(AVStream) must not be used outside libav*.
*/
typedef struct AVStream {
-#if FF_API_AVSTREAM_CLASS
/**
* A class for @ref avoptions. Set on stream creation.
*/
const AVClass *av_class;
-#endif
int index; /**< stream index in AVFormatContext */
/**
diff --git a/libavformat/options.c b/libavformat/options.c
index 0079a06d9a..c7681122cd 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -257,10 +257,7 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c)
return NULL;
st = &sti->pub;
-#if FF_API_AVSTREAM_CLASS
st->av_class = &stream_class;
-#endif
-
st->codecpar = avcodec_parameters_alloc();
if (!st->codecpar)
goto fail;
diff --git a/libavformat/version_major.h b/libavformat/version_major.h
index 057d1ac0fb..1db8e7600e 100644
--- a/libavformat/version_major.h
+++ b/libavformat/version_major.h
@@ -42,7 +42,6 @@
*
*/
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60)
-#define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59)
#define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60)
#define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 60)
--
2.39.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".