From 775d81609627e4c6e091ae3761cdb1235f789276 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 5 Aug 2015 23:38:23 +0200 Subject: demux: remove options to control minimum packet queue size Remove --demuxer-readahead-packets and --demuxer-readahead-bytes. These were a bit useless. They could force a minimum packet queue size, but controlling the queue size with --demuxer-readahead-secs is much nicer. It's fairly certain nobody ever used these options. --- options/options.c | 4 ---- options/options.h | 2 -- 2 files changed, 6 deletions(-) (limited to 'options') diff --git a/options/options.c b/options/options.c index bb19a44688..93f7b4a45e 100644 --- a/options/options.c +++ b/options/options.c @@ -242,8 +242,6 @@ const m_option_t mp_opts[] = { OPT_STRING("sub-demuxer", sub_demuxer_name, 0), OPT_FLAG("demuxer-thread", demuxer_thread, 0), OPT_DOUBLE("demuxer-readahead-secs", demuxer_min_secs, M_OPT_MIN, .min = 0), - OPT_INTRANGE("demuxer-readahead-packets", demuxer_min_packs, 0, 0, MAX_PACKS), - OPT_INTRANGE("demuxer-readahead-bytes", demuxer_min_bytes, 0, 0, MAX_PACK_BYTES), OPT_FLAG("force-seekable", force_seekable, 0), @@ -721,8 +719,6 @@ const struct MPOpts mp_default_opts = { .file_max = 1024 * 1024, }, .demuxer_thread = 1, - .demuxer_min_packs = 0, - .demuxer_min_bytes = 0, .demuxer_min_secs = 1.0, .network_rtsp_transport = 2, .network_timeout = 0.0, diff --git a/options/options.h b/options/options.h index 3dcb783164..677b23f92e 100644 --- a/options/options.h +++ b/options/options.h @@ -196,8 +196,6 @@ typedef struct MPOpts { char **audio_files; char *demuxer_name; int demuxer_thread; - int demuxer_min_packs; - int demuxer_min_bytes; double demuxer_min_secs; char *audio_demuxer_name; char *sub_demuxer_name; -- cgit v1.2.3