diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /cfg-common-opts.h | |
parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'cfg-common-opts.h')
-rw-r--r-- | cfg-common-opts.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cfg-common-opts.h b/cfg-common-opts.h index cf6b3cba26..a4b749190d 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -117,6 +117,7 @@ // select audio/video/subtitle stream OPT_INTRANGE("aid", audio_id, 0, 0, 8190), + {"ausid", &audio_substream_id, CONF_TYPE_INT, 0, 0, 0, NULL}, OPT_INTRANGE("vid", video_id, 0, 0, 8190), OPT_INTRANGE("sid", sub_id, 0, 0, 8190), OPT_FLAG_CONSTANTS("novideo", video_id, 0, -1, -2), |