This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/6.1 in repository ffmpeg.
commit 96b1966e6d60723ea31db73f8bae996acff724cf Author: Kacper Michajłow <[email protected]> AuthorDate: Tue May 12 13:57:09 2026 +0200 Commit: Kacper Michajłow <[email protected]> CommitDate: Sat May 16 18:15:19 2026 +0200 avformat/demux: use correct close function for custom io You may look and think `AVFMT_FLAG_CUSTOM_IO` check is enough, but this is not what it seems. This flag means that user provided custom AVIOContext, before creating AVFormatContext and it should not be closed. However nested sub-demuxers may still open an temporary io, and those have to be closed and use correct io_close2 function. You can see 0dcac9c3f0f8f32009098edb704fac4b08bac951 and ef01061225088c4945f5e309bc695ea5beb2a867 where this flag is cleared for nested opens to avoid leaking those. lavf micro version bumped so API users can know if it is safe to use custom io. (cherry picked from commit dc74fe70b28df8ff69f99b693665163bf9a6a16a) Signed-off-by: Kacper Michajłow <[email protected]> --- libavformat/demux.c | 2 +- libavformat/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 75b3555227..60f491e550 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -365,7 +365,7 @@ fail: ff_id3v2_free_extra_meta(&id3v2_extra_meta); av_dict_free(&tmp); if (s->pb && !(s->flags & AVFMT_FLAG_CUSTOM_IO)) - avio_closep(&s->pb); + ff_format_io_close(s, &s->pb); avformat_free_context(s); *ps = NULL; return ret; diff --git a/libavformat/version.h b/libavformat/version.h index 9e1f484db4..22d00c782f 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ #include "version_major.h" #define LIBAVFORMAT_VERSION_MINOR 16 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
