summaryrefslogtreecommitdiffstats
path: root/core/options.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-05-12 21:47:55 +0200
committerwm4 <wm4@nowhere>2013-05-12 21:47:55 +0200
commite6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch)
tree08b54ef9bb771434fc7fbe9185793503d3ba314c /core/options.h
parent6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff)
parent48f94311516dc1426644b3e68b2a48c22727e1e7 (diff)
downloadmpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2
mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz
Merge branch 'audio_changes'
Conflicts: audio/out/ao_lavc.c
Diffstat (limited to 'core/options.h')
-rw-r--r--core/options.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/core/options.h b/core/options.h
index 9905397f0e..11286bf883 100644
--- a/core/options.h
+++ b/core/options.h
@@ -155,12 +155,11 @@ typedef struct MPOpts {
double force_fps;
- int audio_output_channels;
+ struct mp_chmap audio_output_channels;
int audio_output_format;
int force_srate;
int dtshd;
float playback_speed;
- float drc_level;
struct m_obj_settings *vf_settings;
float movie_aspect;
int flip;
@@ -210,6 +209,12 @@ typedef struct MPOpts {
char *avopt;
} lavc_param;
+ struct ad_lavc_param {
+ float ac3drc;
+ int downmix;
+ char *avopt;
+ } ad_lavc_param;
+
struct lavfdopts {
int probesize;
int probescore;