summaryrefslogtreecommitdiffstats
path: root/cfg-common.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-10-31 07:26:40 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:18:07 +0200
commit4de0369e8d6d8d497b3aa61044a152ae91d477a6 (patch)
treec723c2a64dcba73a21af87ea7ad25cf8026b279f /cfg-common.h
parent45e1333581d9409b2d2be22129f8f6365016b609 (diff)
downloadmpv-4de0369e8d6d8d497b3aa61044a152ae91d477a6.tar.bz2
mpv-4de0369e8d6d8d497b3aa61044a152ae91d477a6.tar.xz
options: move audio_output_channels, audio_output_format to struct
Diffstat (limited to 'cfg-common.h')
-rw-r--r--cfg-common.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/cfg-common.h b/cfg-common.h
index 1e9871f99b..0ae68d0531 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -37,7 +37,6 @@ extern char * codecs_file;
extern int field_dominance;
/* from dec_audio, currently used for ac3surround decoder only */
-extern int audio_output_channels;
extern int fakemono;
/* defined in network.c */
@@ -569,8 +568,8 @@ const m_option_t common_opts[] = {
// force video/audio rate:
{"fps", &force_fps, CONF_TYPE_DOUBLE, CONF_MIN, 0, 0, NULL},
{"srate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL},
- {"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 1, 8, NULL},
- {"format", &audio_output_format, CONF_TYPE_AFMT, 0, 0, 0, NULL},
+ OPT_INTRANGE("channels", audio_output_channels, 0, 1, 8),
+ OPT_AUDIOFORMAT("format", audio_output_format, 0),
OPT_FLOATRANGE("speed", playback_speed, 0, 0.01, 100.0),
// set a-v distance