diff options
| author | wm4 <wm4@nowhere> | 2013-08-25 18:23:40 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-08-26 10:09:41 +0200 |
| commit | 53b5227270ff21c0f4c8aeb8c33a9f4dcbe20600 (patch) | |
| tree | 6a34e81c038c740e7dfcf11aadcc49b87d125ca5 /mpvcore | |
| parent | 58e826e6f27a17ca1a2325e9987d234cf7408fdd (diff) | |
| download | mpv-53b5227270ff21c0f4c8aeb8c33a9f4dcbe20600.tar.bz2 mpv-53b5227270ff21c0f4c8aeb8c33a9f4dcbe20600.tar.xz | |
audio: make internal audio format 0 an invalid format
Having to use -1 for that is generally quite annoying.
Audio formats are created from bitmasks, and it can't be excluded that
0 is not a valid format. Fix this by adjusting AF_FORMAT_I so that it
is never 0. Along with AF_FORMAT_F and the special formats, all valid
formats are covered and guaranteed to be non-0.
It's possible that this commit will cause some regressions, as the
check for invalid audio formats changes a bit.
Diffstat (limited to 'mpvcore')
| -rw-r--r-- | mpvcore/m_option.c | 2 | ||||
| -rw-r--r-- | mpvcore/options.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mpvcore/m_option.c b/mpvcore/m_option.c index b51aa64bd5..f538816ea7 100644 --- a/mpvcore/m_option.c +++ b/mpvcore/m_option.c @@ -1601,7 +1601,7 @@ static int parse_afmt(const m_option_t *opt, struct bstr name, } int fmt = af_str2fmt_short(param); - if (fmt == -1) { + if (!fmt) { mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %.*s: unknown format name: '%.*s'\n", BSTR_P(name), BSTR_P(param)); diff --git a/mpvcore/options.c b/mpvcore/options.c index eeda836914..733b104a46 100644 --- a/mpvcore/options.c +++ b/mpvcore/options.c @@ -802,7 +802,7 @@ const struct MPOpts mp_default_opts = { .sub_pos = 100, .sub_speed = 1.0, .audio_output_channels = MP_CHMAP_INIT_STEREO, - .audio_output_format = -1, // AF_FORMAT_UNKNOWN + .audio_output_format = 0, // AF_FORMAT_UNKNOWN .playback_speed = 1., .movie_aspect = -1., .field_dominance = -1, |