diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /cfg-common.h | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'cfg-common.h')
| -rw-r--r-- | cfg-common.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cfg-common.h b/cfg-common.h index e4f3af7efd..744b6bc459 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -362,6 +362,4 @@ extern const m_option_t noconfig_opts[]; extern const m_option_t lavc_decode_opts_conf[]; extern const m_option_t xvid_dec_opts[]; -int dvd_parse_chapter_range(const m_option_t*, const char*); - #endif /* MPLAYER_CFG_COMMON_H */ |