summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authorsteve <steve@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-28 12:46:23 +0000
committersteve <steve@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-28 12:46:23 +0000
commitf6ee7f826c787b760deeab4403f206fa0f4581cf (patch)
treee7877e14806fa9c528288542f3bdef093a8e3c66 /cfg-mplayer.h
parentb7ff737901eeb3425e56a587f812c34ff969a776 (diff)
downloadmpv-f6ee7f826c787b760deeab4403f206fa0f4581cf.tar.bz2
mpv-f6ee7f826c787b760deeab4403f206fa0f4581cf.tar.xz
Extended oss output driver and libac3 to support 4 and 6 channel output mixes. added -channels command line option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3182 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 0ce55ab9e9..74dab8c60b 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -74,6 +74,9 @@ extern int pl_delay_len;
/* from libvo/aspect.c */
extern float monitor_aspect;
+/* from dec_audio, currently used for ac3surround decoder only */
+extern int audio_output_channels;
+
/*
* CONF_TYPE_FUNC_FULL :
* allows own implemtations for passing the params
@@ -103,6 +106,7 @@ struct config conf[]={
{"dsp", "Use -ao oss:dsp_path!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
{"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0},
{"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1},
+ {"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 2, 6},
#ifdef HAVE_X11
{"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0},
#endif