From ff992e093b93fd8dd0eecd2c592f8608870f0bbe Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 18 Feb 2015 21:09:47 +0100 Subject: demux_lavf: set interrupt_callback Helps with terminating the stream if e.g. HLS streams are stuck. (For other demuxers, the stream's interrupt callback already takes care of this.) --- demux/demux_lavf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'demux') diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index f6608259d8..13f14d9fa1 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -662,6 +662,12 @@ static void update_metadata(demuxer_t *demuxer, AVPacket *pkt) #endif } +static int interrupt_cb(void *ctx) +{ + struct demuxer *demuxer = ctx; + return mp_cancel_test(demuxer->stream->cancel); +} + static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) { struct MPOpts *opts = demuxer->opts; @@ -750,6 +756,11 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) av_dict_set(&dopts, "rtsp_transport", transport, 0); } + avfc->interrupt_callback = (AVIOInterruptCB){ + .callback = interrupt_cb, + .opaque = demuxer, + }; + mp_set_avdict(&dopts, lavfdopts->avopts); if (avformat_open_input(&avfc, priv->filename, priv->avif, &dopts) < 0) { -- cgit v1.2.3