summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-17 08:38:19 +0200
committerwm4 <wm4@nowhere>2012-10-12 10:10:30 +0200
commit6f1486b397d632feaa71f88b980491aea7b69256 (patch)
treecb85ed961be7bd6037a0ae402921516f93ad1808 /mplayer.c
parenta59eee489318d406497eb5fb8a95d7e23d5eee1f (diff)
downloadmpv-6f1486b397d632feaa71f88b980491aea7b69256.tar.bz2
mpv-6f1486b397d632feaa71f88b980491aea7b69256.tar.xz
commands: replace --hardframedrop, change framedropping property
Replace --hardframedrop with --framedrop=hard. Rename the framedrop property from "framedropping" to "framedrop" for the sake of making command line options have the same name as their corresponding property. Change the property to accept choice values instead of numeric values. Remove unused/forgotten auto_quality variable.
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index d910611d71..c90812e871 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -230,7 +230,6 @@ static int ignore_start = 0;
double force_fps = 0;
static int force_srate = 0;
-int frame_dropping = 0; // option 0=no drop 1= drop vo 2= drop decode
static int play_n_frames = -1;
static int play_n_frames_mf = -1;
@@ -1797,7 +1796,7 @@ static int check_framedrop(struct MPContext *mpctx, double frame_time)
&& !mpctx->restart_playback) {
++drop_frame_cnt;
++dropped_frames;
- return frame_dropping;
+ return mpctx->opts.frame_dropping;
} else
dropped_frames = 0;
}