From 69ae23fdd1e39f4e7aa30082e36cc635d954bccf Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 25 Dec 2017 11:43:04 +0100 Subject: options: drop some previously deprecated options A release has been made, so drop options deprecated for that release. Also drop some options which have been deprecated a much longer time before. Also fix a typo in client-api-changes.rst. --- player/loadfile.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'player/loadfile.c') diff --git a/player/loadfile.c b/player/loadfile.c index d2e26c1ba4..ca782f88d8 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -360,11 +360,8 @@ struct track *select_default_track(struct MPContext *mpctx, int order, { struct MPOpts *opts = mpctx->opts; int tid = opts->stream_id[order][type]; - int ffid = order == 0 ? opts->stream_id_ff[type] : -1; char **langs = order == 0 ? opts->stream_lang[type] : NULL; - if (ffid != -1) - tid = -1; // prefer selecting ffid - if (tid == -2 || ffid == -2) + if (tid == -2) return NULL; bool select_fallback = type == STREAM_VIDEO || type == STREAM_AUDIO; struct track *pick = NULL; @@ -374,8 +371,6 @@ struct track *select_default_track(struct MPContext *mpctx, int order, continue; if (track->user_tid == tid) return track; - if (track->ff_index == ffid) - return track; if (!pick || compare_track(track, pick, langs, mpctx->opts)) pick = track; } -- cgit v1.2.3