From 53b5227270ff21c0f4c8aeb8c33a9f4dcbe20600 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 25 Aug 2013 18:23:40 +0200 Subject: 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. --- mpvcore/m_option.c | 2 +- mpvcore/options.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mpvcore') 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, -- cgit v1.2.3