From adbd035b50aabdef1f401f51a8f1d06d6f3d79d3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 8 Sep 2018 23:51:29 +0200 Subject: demux: autoselection is gone Was used by DVD, I think. --- demux/demux.c | 8 -------- demux/demux.h | 1 - 2 files changed, 9 deletions(-) diff --git a/demux/demux.c b/demux/demux.c index 94f9aec856..4c9e462c5d 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -170,7 +170,6 @@ struct demux_internal { bool last_eof; // last actual global EOF status bool eof; // whether we're in EOF state (reset for retry) bool idle; - bool autoselect; double min_secs; size_t max_bytes; size_t max_bytes_bw; @@ -853,7 +852,6 @@ static void demux_add_sh_stream_locked(struct demux_internal *in, .sh = sh, .type = sh->type, .index = sh->index, - .selected = in->autoselect, .global_correct_dts = true, .global_correct_pos = true, }; @@ -2943,12 +2941,6 @@ void demuxer_select_track(struct demuxer *demuxer, struct sh_stream *stream, pthread_mutex_unlock(&in->lock); } -void demux_set_stream_autoselect(struct demuxer *demuxer, bool autoselect) -{ - assert(!demuxer->in->threading); // laziness - demuxer->in->autoselect = autoselect; -} - // This is for demuxer implementations only. demuxer_select_track() sets the // logical state, while this function returns the actual state (in case the // demuxer attempts to cache even unselected packets for track switching - this diff --git a/demux/demux.h b/demux/demux.h index 37aef5c059..d744734525 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -278,7 +278,6 @@ void demux_block_reading(struct demuxer *demuxer, bool block); void demuxer_select_track(struct demuxer *demuxer, struct sh_stream *stream, double ref_pts, bool selected); -void demux_set_stream_autoselect(struct demuxer *demuxer, bool autoselect); void demuxer_help(struct mp_log *log); -- cgit v1.2.3