This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 2bae6f9d52 avformat/ogg: drop CELT support
2bae6f9d52 is described below
commit 2bae6f9d524aa56ced17017bdff0f89b7a4b7e12
Author: Romain Beauxis <[email protected]>
AuthorDate: Thu May 21 08:56:41 2026 -0500
Commit: Romain Beauxis <[email protected]>
CommitDate: Sat May 23 10:16:38 2026 -0500
avformat/ogg: drop CELT support
---
Changelog | 1 +
libavcodec/version.h | 2 +-
libavformat/Makefile | 1 -
libavformat/oggdec.c | 1 -
libavformat/oggdec.h | 1 -
libavformat/oggparsecelt.c | 107 ---------------------------------------------
6 files changed, 2 insertions(+), 111 deletions(-)
diff --git a/Changelog b/Changelog
index cca53d0d7c..aff0c78153 100644
--- a/Changelog
+++ b/Changelog
@@ -15,6 +15,7 @@ version <next>:
- Animated WebP decoder
- Animated WebP demuxer
- Remove CELT decoding support (doesn't affect Opus CELT)
+- Remove ogg/celt parsing
version 8.1:
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 0a91c6b916..0f3184d427 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 34
-#define LIBAVCODEC_VERSION_MICRO 101
+#define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 123de41184..33525369a4 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -436,7 +436,6 @@ OBJS-$(CONFIG_AV1_DEMUXER) += av1dec.o
OBJS-$(CONFIG_OBU_DEMUXER) += av1dec.o
OBJS-$(CONFIG_OBU_MUXER) += rawenc.o
OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \
- oggparsecelt.o \
oggparsedirac.o \
oggparseflac.o \
oggparseogm.o \
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index a7b23c8d65..48279f2928 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -48,7 +48,6 @@ static const struct ogg_codec * const ogg_codecs[] = {
&ff_vorbis_codec,
&ff_theora_codec,
&ff_flac_codec,
- &ff_celt_codec,
&ff_opus_codec,
&ff_vp8_codec,
&ff_old_dirac_codec,
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index f29912bca8..72f3d40c5a 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -123,7 +123,6 @@ struct ogg {
#define OGG_NOGRANULE_VALUE (-1ull)
-extern const struct ogg_codec ff_celt_codec;
extern const struct ogg_codec ff_dirac_codec;
extern const struct ogg_codec ff_flac_codec;
extern const struct ogg_codec ff_ogm_audio_codec;
diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c
deleted file mode 100644
index 61ce8ada38..0000000000
--- a/libavformat/oggparsecelt.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Xiph CELT parser for Ogg
- * Copyright (c) 2011 Nicolas George
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <string.h>
-
-#include "libavutil/intreadwrite.h"
-#include "libavutil/mem.h"
-#include "avformat.h"
-#include "internal.h"
-#include "oggdec.h"
-
-/* CELT-over-Ogg streams use at most a couple of vorbiscomment "extra"
headers. */
-#define CELT_MAX_EXTRA_HEADERS 16
-
-struct oggcelt_private {
- int extra_headers_left;
-};
-
-static int celt_header(AVFormatContext *s, int idx)
-{
- struct ogg *ogg = s->priv_data;
- struct ogg_stream *os = ogg->streams + idx;
- AVStream *st = s->streams[idx];
- struct oggcelt_private *priv = os->private;
- uint8_t *p = os->buf + os->pstart;
- int ret;
-
- if (os->psize == 60 &&
- !memcmp(p, ff_celt_codec.magic, ff_celt_codec.magicsize)) {
- /* Main header */
-
- uint32_t version, sample_rate, nb_channels;
- uint32_t overlap, extra_headers;
-
- priv = av_malloc(sizeof(struct oggcelt_private));
- if (!priv)
- return AVERROR(ENOMEM);
- ret = ff_alloc_extradata(st->codecpar, 2 * sizeof(uint32_t));
- if (ret < 0) {
- av_free(priv);
- return ret;
- }
- version = AV_RL32(p + 28);
- /* unused header size field skipped */
- sample_rate = AV_RL32(p + 36);
- nb_channels = AV_RL32(p + 40);
- overlap = AV_RL32(p + 48);
- /* unused bytes per packet field skipped */
- extra_headers = AV_RL32(p + 56);
- if (extra_headers > CELT_MAX_EXTRA_HEADERS) {
- av_log(s, AV_LOG_ERROR,
- "Too many CELT extra headers (%u)\n", extra_headers);
- av_free(priv);
- return AVERROR_INVALIDDATA;
- }
- st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codecpar->codec_id = AV_CODEC_ID_CELT;
- st->codecpar->sample_rate = sample_rate;
- st->codecpar->ch_layout.nb_channels = nb_channels;
- if (sample_rate)
- avpriv_set_pts_info(st, 64, 1, sample_rate);
-
- if (os->private) {
- av_free(priv);
- priv = os->private;
- }
- os->private = priv;
- priv->extra_headers_left = 1 + extra_headers;
-
- AV_WL32(st->codecpar->extradata + 0, overlap);
- AV_WL32(st->codecpar->extradata + 4, version);
- return 1;
- } else if (priv && priv->extra_headers_left) {
- /* Extra headers (vorbiscomment) */
-
- ff_vorbis_stream_comment(s, st, p, os->psize);
- priv->extra_headers_left--;
- return 1;
- } else {
- return 0;
- }
-}
-
-const struct ogg_codec ff_celt_codec = {
- .magic = "CELT ",
- .magicsize = 8,
- .header = celt_header,
- .nb_header = 2,
-};
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
