RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-24 20:31:37 +00:00
Code Issues Releases Wiki Activity

demux: don't attempt to open a demuxer after abort signal was given

Browse Source 
demux_open() kept trying to fallback to other demuxers when opening was
cancelled. This was not really a problem, but it was stupid.
This commit is contained in:
wm4 2015-10-06 18:18:18 +02:00
parent ecb776f88e
commit 288eaacd85
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demux/demux.c
View File

@ -939,6 +939,9 @@ static struct demuxer *open_given_type(struct mpv_global *global,
struct demuxer_params *params, struct demuxer_params *params,
enum demux_check check) enum demux_check check)
{ {
if (mp_cancel_test(stream->cancel))
return NULL;
struct demuxer *demuxer = talloc_ptrtype(NULL, demuxer); struct demuxer *demuxer = talloc_ptrtype(NULL, demuxer);
*demuxer = (struct demuxer) { *demuxer = (struct demuxer) {
.desc = desc, .desc = desc,