This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch release/6.1
in repository ffmpeg.
The following commit(s) were added to refs/heads/release/6.1 by this push:
new 36da931d7c avformat/demux: use io_close2 when closing avfromat
36da931d7c is described below
commit 36da931d7c53884153d17720e50bbdbaaa997fad
Author: Kacper Michajłow <[email protected]>
AuthorDate: Sat May 17 05:50:28 2025 +0200
Commit: Kacper Michajłow <[email protected]>
CommitDate: Thu Jul 16 11:15:34 2026 +0000
avformat/demux: use io_close2 when closing avfromat
It's not valid to call avio_close() on context that has not been open
with avio_open().
This fixes use of custom IO. (io_open / io_close2 callbacks)
Note that by default io_close2 is set to io_close2_default() which calls
avio_close(), so default case will work the same as before.
Signed-off-by: Kacper Michajłow <[email protected]>
Reviewed-by: Andreas Rheinhardt <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 1a7e802c8f970e76807f08c3d3fb3513ae5a4882)
---
libavformat/demux.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavformat/demux.c b/libavformat/demux.c
index 60f491e550..2fc6c211cc 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -390,11 +390,10 @@ void avformat_close_input(AVFormatContext **ps)
if (s->iformat->read_close)
s->iformat->read_close(s);
+ ff_format_io_close(s, &pb);
avformat_free_context(s);
*ps = NULL;
-
- avio_close(pb);
}
static void force_codec_ids(AVFormatContext *s, AVStream *st)
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
