mirror of https://github.com/mpv-player/mpv
osxbundle: config file special case isn't needed anymore
The previous commit effectively fixes the mess caused by 'config' vs. 'mpv.conf', and the hack introduced by commite01a6dac
and extended by commitdb167cd4
isn't needed anymore. (cherry picked from commit816d7bba1f
)
This commit is contained in:
parent
21a95f5ed9
commit
23959eb5b4
|
@ -84,12 +84,6 @@ void mp_parse_cfgfiles(struct MPContext *mpctx)
|
|||
talloc_free(cf);
|
||||
#endif
|
||||
|
||||
// Stupid hack to set OSX bundle defaults, if applicable. (The file is only
|
||||
// found if starting from the OSX bundle.)
|
||||
#if HAVE_COCOA
|
||||
load_all_cfgfiles(mpctx, section, "osx-bundle.conf");
|
||||
#endif
|
||||
|
||||
load_all_cfgfiles(mpctx, section, "mpv.conf|config");
|
||||
|
||||
if (encoding)
|
||||
|
|
Loading…
Reference in New Issue