diff options
| author | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
| commit | e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch) | |
| tree | 08b54ef9bb771434fc7fbe9185793503d3ba314c /core/defaultopts.c | |
| parent | 6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff) | |
| parent | 48f94311516dc1426644b3e68b2a48c22727e1e7 (diff) | |
| download | mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2 mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz | |
Merge branch 'audio_changes'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'core/defaultopts.c')
| -rw-r--r-- | core/defaultopts.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/defaultopts.c b/core/defaultopts.c index b80bea5c1e..3ffc5e2555 100644 --- a/core/defaultopts.c +++ b/core/defaultopts.c @@ -4,6 +4,7 @@ #include "defaultopts.h" #include "core/options.h" #include "audio/mixer.h" +#include "audio/chmap.h" void set_default_mplayer_options(struct MPOpts *opts) { @@ -72,10 +73,9 @@ void set_default_mplayer_options(struct MPOpts *opts) .audio_display = 1, .sub_visibility = 1, .extension_parsing = 1, - .audio_output_channels = 2, + .audio_output_channels = MP_CHMAP_INIT_STEREO, .audio_output_format = -1, // AF_FORMAT_UNKNOWN .playback_speed = 1., - .drc_level = 1., .movie_aspect = -1., .sub_auto = 1, .osd_bar_visible = 1, @@ -93,6 +93,10 @@ void set_default_mplayer_options(struct MPOpts *opts) .workaround_bugs = 1, // autodetect .error_concealment = 3, }, + .ad_lavc_param = { + .ac3drc = 1., + .downmix = 1, + }, .input = { .key_fifo_size = 7, .ar_delay = 200, |