RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 21:12:23 +00:00
Code Issues Releases Wiki Activity

osxbundle: config file special case isn't needed anymore

Browse Source 
The previous commit effectively fixes the mess caused by 'config' vs.
'mpv.conf', and the hack introduced by commit e01a6dac and extended by
commit db167cd4 isn't needed anymore.
This commit is contained in:
wm4 2015-02-15 17:29:06 +01:00
parent a27aa68dd3
commit 816d7bba1f
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf → TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf
View File

6
player/configfiles.c
View File

@ -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)