This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 274bc5f9ae6e3f74f23d6b74ed2cbd062fcb0ed8 Author: Romain Beauxis <[email protected]> AuthorDate: Thu May 21 08:06:15 2026 -0500 Commit: Romain Beauxis <[email protected]> CommitDate: Fri May 22 08:20:13 2026 -0500 avformat: deprecate FF_FDEBUG_TS in favor of AV_FDEBUG_TS, add AV_FDEBUG_ID3V2 Signed-off-by: Romain Beauxis <[email protected]> --- doc/APIchanges | 4 ++++ libavformat/avformat.h | 8 ++++++-- libavformat/demux.c | 8 ++++---- libavformat/id3v2.c | 2 +- libavformat/mpeg.c | 6 +++--- libavformat/mux.c | 6 +++--- libavformat/tests/id3v2.c | 2 +- libavformat/version_major.h | 2 ++ 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 2d1be16756..9f4613d1a9 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2025-03-28 API changes, most recent first: +2026-05-14 - xxxxxxxxxxx - lavf 62.18.100 - avformat.h + Add AV_FDEBUG_ID3V2 debug flag, deprecate FF_FDEBUG_TS in favor of + AV_FDEBUG_TS. + 2026-05-17 - xxxxxxxxxxx - lavf 62.17.100 - avformat.h Add AV_STREAM_GROUP_PARAMS_TREF. Add AVStreamGroupTREF. diff --git a/libavformat/avformat.h b/libavformat/avformat.h index ba9cebdb9e..8c696070e4 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1558,8 +1558,12 @@ typedef struct AVFormatContext { * Flags to enable debugging. */ int debug; -#define FF_FDEBUG_TS 0x0001 -#define FF_FDEBUG_ID3V2 0x0002 +#define AV_FDEBUG_TS 0x0001 +#define AV_FDEBUG_ID3V2 0x0002 + +#if FF_API_FDEBUG_TS +#define FF_FDEBUG_TS AV_FDEBUG_TS +#endif /** * The maximum number of streams. diff --git a/libavformat/demux.c b/libavformat/demux.c index 555399720c..a87f2755de 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1090,7 +1090,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, pkt->pts > pkt->dts) presentation_delayed = 1; - if (s->debug & FF_FDEBUG_TS) + if (s->debug & AV_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "IN delayed:%d pts:%s, dts:%s cur_dts:%s st:%d pc:%p duration:%"PRId64" delay:%d onein_oneout:%d\n", presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(sti->cur_dts), @@ -1160,7 +1160,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if (pkt->dts > sti->cur_dts) sti->cur_dts = pkt->dts; - if (s->debug & FF_FDEBUG_TS) + if (s->debug & AV_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "OUTdelayed:%d/%d pts:%s, dts:%s cur_dts:%s st:%d (%d)\n", presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(sti->cur_dts), st->index, st->id); @@ -1471,7 +1471,7 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) av_ts2str(pkt->dts), pkt->size); } - if (s->debug & FF_FDEBUG_TS) + if (s->debug & AV_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "ff_read_packet stream=%d, pts=%s, dts=%s, size=%d, duration=%"PRId64", flags=%d\n", pkt->stream_index, @@ -1568,7 +1568,7 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) fci->metafree = metaret == AVERROR_OPTION_NOT_FOUND; } - if (s->debug & FF_FDEBUG_TS) + if (s->debug & AV_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "read_frame_internal stream=%d, pts=%s, dts=%s, " "size=%d, duration=%"PRId64", flags=%d\n", diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index b06b680f91..93f22cab15 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -1055,7 +1055,7 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, pbx = &pb_local.pub; // read from sync buffer } #endif - if (s && (s->debug & FF_FDEBUG_ID3V2)) { + if (s && (s->debug & AV_FDEBUG_ID3V2)) { int64_t pos = avio_tell(pbx); uint8_t *buf = av_malloc(tlen + 3U); if (buf) { diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index a7a2ef78e6..c78cc63603 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -663,7 +663,7 @@ found: pkt->pos = dummy_pos; pkt->stream_index = st->index; - if (s->debug & FF_FDEBUG_TS) + if (s->debug & AV_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f size=%d\n", pkt->stream_index, pkt->pts / 90000.0, pkt->dts / 90000.0, pkt->size); @@ -684,7 +684,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, for (;;) { len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts); if (len < 0) { - if (s->debug & FF_FDEBUG_TS) + if (s->debug & AV_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "none (ret=%d)\n", len); return AV_NOPTS_VALUE; } @@ -694,7 +694,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, } avio_skip(s->pb, len); } - if (s->debug & FF_FDEBUG_TS) + if (s->debug & AV_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n", pos, dts, dts / 90000.0); *ppos = pos; diff --git a/libavformat/mux.c b/libavformat/mux.c index db3b6c2bfe..363e5e1a57 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -524,7 +524,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * fci->missing_ts_warning = 1; } - if (s->debug & FF_FDEBUG_TS) + if (s->debug & AV_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "compute_muxer_pkt_fields: pts:%s dts:%s cur_dts:%s b:%d size:%d st:%d\n", av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(sti->cur_dts), delay, pkt->size, pkt->stream_index); @@ -572,7 +572,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * return AVERROR(EINVAL); } - if (s->debug & FF_FDEBUG_TS) + if (s->debug & AV_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "av_write_frame: pts2:%s dts2:%s\n", av_ts2str(pkt->pts), av_ts2str(pkt->dts)); @@ -1095,7 +1095,7 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt, { int ret; - if (s->debug & FF_FDEBUG_TS) + if (s->debug & AV_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "%s size:%d dts:%s pts:%s\n", __func__, pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts)); diff --git a/libavformat/tests/id3v2.c b/libavformat/tests/id3v2.c index 86e6162223..c6a130df7a 100644 --- a/libavformat/tests/id3v2.c +++ b/libavformat/tests/id3v2.c @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) if (!s) return 1; - s->debug |= FF_FDEBUG_ID3V2; + s->debug |= AV_FDEBUG_ID3V2; ret = avio_open(&s->pb, argv[1], AVIO_FLAG_READ); if (ret < 0) { diff --git a/libavformat/version_major.h b/libavformat/version_major.h index c2f6e1616b..878f93b10a 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -47,6 +47,8 @@ #define FF_API_NO_DEFAULT_TLS_VERIFY (LIBAVFORMAT_VERSION_MAJOR < 63) +#define FF_API_FDEBUG_TS (LIBAVFORMAT_VERSION_MAJOR < 63) + #define FF_API_R_FRAME_RATE 1 #endif /* AVFORMAT_VERSION_MAJOR_H */ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
