diff options
| author | wm4 <wm4@nowhere> | 2013-07-08 21:55:44 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-08 21:55:44 +0200 |
| commit | 31f685040bd2152d541ed16cf441c6b5e7e430fd (patch) | |
| tree | b8351b2847231bbc15d883a622ac972945cce6b4 /stream/stream_tv.c | |
| parent | 73c76de91edbf8a55eb725196ff54583e3428510 (diff) | |
| parent | 7a71a2cc483d17bed94408d5aee6fba6893558cb (diff) | |
| download | mpv-31f685040bd2152d541ed16cf441c6b5e7e430fd.tar.bz2 mpv-31f685040bd2152d541ed16cf441c6b5e7e430fd.tar.xz | |
Merge branch 'master' into remove_old_demuxers
Conflicts:
DOCS/man/en/changes.rst
DOCS/man/en/options.rst
Diffstat (limited to 'stream/stream_tv.c')
| -rw-r--r-- | stream/stream_tv.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/stream/stream_tv.c b/stream/stream_tv.c index 0a519efb25..595657dc43 100644 --- a/stream/stream_tv.c +++ b/stream/stream_tv.c @@ -72,11 +72,7 @@ tv_param_t stream_tv_defaults = { -1, //gain 0, //scan_autostart 50, //scan_threshold - 0.5, //scan_period - 0, //hidden_video_renderer; - 0, //hidden_vp_renderer; - 0, //system_clock; - 0 //normalize_audio_chunks; + 0.5, //scan_period }; #define ST_OFF(f) M_ST_OFF(tv_param_t,f) |