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/m_option.h | |
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/m_option.h')
-rw-r--r-- | core/m_option.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/m_option.h b/core/m_option.h index 0026406569..c94b170424 100644 --- a/core/m_option.h +++ b/core/m_option.h @@ -25,6 +25,7 @@ #include "config.h" #include "core/bstr.h" +#include "audio/chmap.h" // m_option allows to parse, print and copy data of various types. @@ -60,6 +61,7 @@ extern const m_option_type_t m_option_type_afmt; extern const m_option_type_t m_option_type_color; extern const m_option_type_t m_option_type_geometry; extern const m_option_type_t m_option_type_size_box; +extern const m_option_type_t m_option_type_chmap; // Callback used by m_option_type_print_func options. typedef int (*m_opt_func_full_t)(const m_option_t *, const char *, const char *); @@ -194,6 +196,7 @@ union m_option_value { struct m_color color; struct m_geometry geometry; struct m_geometry size_box; + struct mp_chmap chmap; }; //////////////////////////////////////////////////////////////////////////// @@ -568,6 +571,9 @@ int m_option_required_params(const m_option_t *opt); #define OPT_AUDIOFORMAT(...) \ OPT_GENERAL(int, __VA_ARGS__, .type = &m_option_type_afmt) +#define OPT_CHMAP(...) \ + OPT_GENERAL(struct mp_chmap, __VA_ARGS__, .type = &m_option_type_chmap) + #define M_CHOICES(choices) \ .priv = (void *)&(const struct m_opt_choice_alternatives[]){ \ |