diff options
| -rw-r--r-- | TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf (renamed from TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf) | 0 | ||||
| -rw-r--r-- | player/configfiles.c | 6 |
2 files changed, 0 insertions, 6 deletions
diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf index ff78dfacf6..ff78dfacf6 100644 --- a/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf +++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf diff --git a/player/configfiles.c b/player/configfiles.c index 463d1a4f41..bc89439e3a 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -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) |