From 9826528c3196512c2e953a4087a618961a81b50a Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 25 Nov 2019 23:00:42 -0800 Subject: [PATCH] deps/media-playback: Don't use interrupt cb for local files This fixes an issue where local files were using the avformat interrupt callback, which is only supposed to be use to prevent blocking on network calls. --- deps/media-playback/media-playback/media.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deps/media-playback/media-playback/media.c b/deps/media-playback/media-playback/media.c index bc2986839..e819840f3 100644 --- a/deps/media-playback/media-playback/media.c +++ b/deps/media-playback/media-playback/media.c @@ -577,8 +577,10 @@ static bool init_avformat(mp_media_t *m) av_dict_set_int(&opts, "buffer_size", m->buffering, 0); m->fmt = avformat_alloc_context(); - m->fmt->interrupt_callback.callback = interrupt_callback; - m->fmt->interrupt_callback.opaque = m; + if (!m->is_local_file) { + m->fmt->interrupt_callback.callback = interrupt_callback; + m->fmt->interrupt_callback.opaque = m; + } int ret = avformat_open_input(&m->fmt, m->path, format, opts ? &opts : NULL);