diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
| commit | 8dc0743571630a08fd40fa88aa09b12b4ce65bf2 (patch) | |
| tree | e1c4465768635d77954b5fd21ae726444ee4f48a /defaultopts.c | |
| parent | aebdf4f153438497b9310bd1417b5216f07e043b (diff) | |
| parent | afecdb681bed81b5df0ed18a300c68be603dfdf9 (diff) | |
| download | mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.bz2 mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
mplayer.c
screenshot.c
Diffstat (limited to 'defaultopts.c')
| -rw-r--r-- | defaultopts.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/defaultopts.c b/defaultopts.c index 86e3908614..bf0489a335 100644 --- a/defaultopts.c +++ b/defaultopts.c @@ -57,7 +57,6 @@ void set_default_mplayer_options(struct MPOpts *opts) .lavc_param = { .workaround_bugs = 1, // autodetect - .error_resilience = 2, .error_concealment = 3, }, .input = { |