This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/7.0 in repository ffmpeg.
commit 9bccbd78239b0f25cad5e0628418dd578eb30f11 Author: Kacper Michajłow <[email protected]> AuthorDate: Mon May 11 11:07:59 2026 +0200 Commit: Kacper Michajłow <[email protected]> CommitDate: Sat May 16 18:13:54 2026 +0200 avformat/dashdec: respect io_open set in AVFormatContext io_open_default() will call internal impl if needed, don't call it directly. (cherry picked from commit fbc400364257b7b9d17572165400f7d4b52dc68c) Signed-off-by: Kacper Michajłow <[email protected]> --- libavformat/dashdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 3e5a39c781..cb7c24f62c 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -445,7 +445,7 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, av_freep(pb); av_dict_copy(&tmp, *opts, 0); av_dict_copy(&tmp, opts2, 0); - ret = ffio_open_whitelist(pb, url, AVIO_FLAG_READ, c->interrupt_callback, &tmp, s->protocol_whitelist, s->protocol_blacklist); + ret = s->io_open(s, pb, url, AVIO_FLAG_READ, &tmp); if (ret >= 0) { // update cookies on http response with setcookies. char *new_cookies = NULL; @@ -1233,7 +1233,7 @@ static int parse_manifest(AVFormatContext *s, const char *url, AVIOContext *in) close_in = 1; av_dict_copy(&opts, c->avio_opts, 0); - ret = ffio_open_whitelist(&in, url, AVIO_FLAG_READ, c->interrupt_callback, &opts, s->protocol_whitelist, s->protocol_blacklist); + ret = s->io_open(s, &in, url, AVIO_FLAG_READ, &opts); av_dict_free(&opts); if (ret < 0) return ret; @@ -1376,7 +1376,7 @@ cleanup: av_bprint_finalize(&buf, NULL); if (close_in) { - avio_close(in); + ff_format_io_close(s, &in); } return ret; } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
