This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 22519f6a2803e9b3060183d79cd3f3ff88addc09 Author: Romain Beauxis <[email protected]> AuthorDate: Thu Nov 5 10:17:34 2026 -0600 Commit: Romain Beauxis <[email protected]> CommitDate: Thu Nov 12 16:49:31 2026 +0000 avformat/id3v2: move to id3v2/ The reader moves to id3v2/reader.c and the writer to id3v2/writer.c, following the source tree layout rules, while id3v2.h stays next to the directory. --- MAINTAINERS | 2 +- libavformat/Makefile | 11 ++++++----- libavformat/id3v2/Makefile | 2 ++ libavformat/{id3v2.c => id3v2/reader.c} | 10 +++++----- libavformat/{id3v2enc.c => id3v2/writer.c} | 12 ++++++------ 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index dfba5da3d4..d78dcca97f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -435,7 +435,7 @@ Muxers/Demuxers: hlsenc.c Christian Suloway, Steven Liu hxvs.c Zhao Zhili iamf* [2] James Almer - id3v2* Romain Beauxis + id3v2.h, id3v2/* Romain Beauxis idcin.c Mike Melanson idroqdec.c Mike Melanson iff.c Jaikrishnan Menon diff --git a/libavformat/Makefile b/libavformat/Makefile index 29db52477f..edcc29db2c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -19,7 +19,7 @@ OBJS = allformats.o \ dv.o \ format.o \ id3v1.o \ - id3v2.o \ + id3v2/reader.o \ isom_tags.o \ lcevc.o \ metadata.o \ @@ -42,6 +42,7 @@ OBJS = allformats.o \ OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o # subsystems +include $(SRC_PATH)/libavformat/id3v2/Makefile include $(SRC_PATH)/libavformat/vorbis/comment/Makefile OBJS-$(CONFIG_CBS_APV_LAVF) += cbs_apv.o cbs.o OBJS-$(CONFIG_CBS_AV1_LAVF) += cbs_av1.o cbs.o @@ -102,7 +103,7 @@ OBJS-$(CONFIG_ADF_DEMUXER) += bintext.o sauce.o OBJS-$(CONFIG_ADP_DEMUXER) += adp.o OBJS-$(CONFIG_ADS_DEMUXER) += ads.o OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o apetag.o img2.o \ - id3v2enc.o + id3v2/writer.o OBJS-$(CONFIG_ADX_DEMUXER) += adxdec.o rawdec.o OBJS-$(CONFIG_ADX_MUXER) += rawenc.o OBJS-$(CONFIG_AEA_DEMUXER) += aeadec.o pcm.o @@ -110,7 +111,7 @@ OBJS-$(CONFIG_AEA_MUXER) += aeaenc.o rawenc.o OBJS-$(CONFIG_AFC_DEMUXER) += afc.o OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o aiff.o pcm.o \ mov_chan.o replaygain.o -OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o aiff.o id3v2enc.o +OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o aiff.o id3v2/writer.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o OBJS-$(CONFIG_ALP_DEMUXER) += alp.o OBJS-$(CONFIG_ALP_MUXER) += alp.o rawenc.o @@ -405,7 +406,7 @@ OBJS-$(CONFIG_MOV_MUXER) += movenc.o \ apv.o dovi_isom.o evc.o OBJS-$(CONFIG_MP2_MUXER) += rawenc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o -OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o +OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2/writer.o OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o apetag.o img2.o OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o apetag.o img2.o OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o @@ -467,7 +468,7 @@ OBJS-$(CONFIG_OGG_MUXER) += oggenc.o \ OBJS-$(CONFIG_OGV_MUXER) += oggenc.o \ vorbis/comment/writer.o OBJS-$(CONFIG_OMA_DEMUXER) += omadec.o pcm.o oma.o -OBJS-$(CONFIG_OMA_MUXER) += omaenc.o rawenc.o oma.o id3v2enc.o +OBJS-$(CONFIG_OMA_MUXER) += omaenc.o rawenc.o oma.o id3v2/writer.o OBJS-$(CONFIG_OPUS_MUXER) += oggenc.o \ vorbis/comment/writer.o OBJS-$(CONFIG_OSQ_DEMUXER) += osq.o rawdec.o diff --git a/libavformat/id3v2/Makefile b/libavformat/id3v2/Makefile new file mode 100644 index 0000000000..156806c75f --- /dev/null +++ b/libavformat/id3v2/Makefile @@ -0,0 +1,2 @@ +clean:: + $(RM) $(CLEANSUFFIXES:%=libavformat/id3v2/%) diff --git a/libavformat/id3v2.c b/libavformat/id3v2/reader.c similarity index 99% rename from libavformat/id3v2.c rename to libavformat/id3v2/reader.c index 20d37f345b..1a8c534f71 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2/reader.c @@ -40,11 +40,11 @@ #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" #include "libavcodec/png.h" -#include "avio_internal.h" -#include "avlanguage.h" -#include "demux.h" -#include "id3v1.h" -#include "id3v2.h" +#include "libavformat/avio_internal.h" +#include "libavformat/avlanguage.h" +#include "libavformat/demux.h" +#include "libavformat/id3v1.h" +#include "libavformat/id3v2.h" const AVMetadataConv ff_id3v2_34_metadata_conv[] = { { "COMM", "comment" }, diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2/writer.c similarity index 98% rename from libavformat/id3v2enc.c rename to libavformat/id3v2/writer.c index c538d13829..cab838a456 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2/writer.c @@ -25,12 +25,12 @@ #include "libavutil/dict.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" -#include "avformat.h" -#include "avlanguage.h" -#include "avio.h" -#include "avio_internal.h" -#include "id3v2.h" -#include "mux.h" +#include "libavformat/avformat.h" +#include "libavformat/avlanguage.h" +#include "libavformat/avio.h" +#include "libavformat/avio_internal.h" +#include "libavformat/id3v2.h" +#include "libavformat/mux.h" static void id3v2_put_size(AVIOContext *pb, int size) { -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
