diff options
| author |  wm4 <wm4@mplayer2.org> | 2012-07-28 17:07:49 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-07-28 17:24:05 +0200 |
| commit | 51e198c2a1e43b74ad35ef358628dcd8791158d9 (patch) | |
| tree | 60f6c2255ed912a7a4866b71728104a2cb2442f1 /defaultopts.c | |
| parent | 2793e7eb70a342b346788f83e1ed660c8e0d491e (diff) | |
| parent | 7dfaaa95104a8e6dc024fddaf1b49c71768f1be7 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
.gitignore
bstr.c
cfg-mplayer.h
defaultopts.c
libvo/video_out.c
The conflict in bstr.c is due to uau adding a bstr_getline function in
commit 2ba8b91a97e7e8. This function already existed in this branch.
While uau's function is obviously derived from mine, it's incompatible.
His function preserves line breaks, while mine strips them. Add a
bstr_strip_linebreaks function, fix all other uses of bstr_getline, and
pick uau's implementation.
In .gitignore, change vo_gl3_shaders.h to use an absolute path
additional to resolving the merge conflict.
Diffstat (limited to 'defaultopts.c')
| -rw-r--r-- | defaultopts.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/defaultopts.c b/defaultopts.c index 8cb86c0457..d9485c24bf 100644 --- a/defaultopts.c +++ b/defaultopts.c @@ -22,7 +22,6 @@ void set_default_mplayer_options(struct MPOpts *opts) .vo_gamma_hue = 1000, .osd_level = 1, .osd_duration = 1000, - .stream_dump_name = "stream.dump", .loop_times = -1, .ordered_chapters = 1, .chapter_merge_threshold = 100, @@ -33,7 +32,6 @@ void set_default_mplayer_options(struct MPOpts *opts) .user_correct_pts = -1, .initial_audio_sync = 1, .term_osd = 2, - .term_osd_esc = "\x1b[A\r\x1b[K", .consolecontrols = 1, .doubleclick_time = 300, .audio_id = -1, @@ -62,7 +60,6 @@ void set_default_mplayer_options(struct MPOpts *opts) .error_concealment = 3, }, .input = { - .config_file = "input.conf", .key_fifo_size = 7, .ar_delay = 100, .ar_rate = 8, |