diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:42:20 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:42:20 +0300 |
commit | 4785c2617ee9ac186464a55c1bfb13a5781ef041 (patch) | |
tree | 2424f18b68b2037bd4e290471821e9adae28b876 /mplayer.c | |
parent | 2732d5efbae3e0ee28bc6b70ceab1eb77e593216 (diff) | |
parent | 38abe6ff7a3810f8e01b6296570e92df1b12b09c (diff) | |
download | mpv-4785c2617ee9ac186464a55c1bfb13a5781ef041.tar.bz2 mpv-4785c2617ee9ac186464a55c1bfb13a5781ef041.tar.xz |
Merge svn changes up to r30967
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -97,10 +97,6 @@ #include "input/input.h" -#ifdef CONFIG_WIN32DLL -#include "loader/drv.h" // for SetCodecPath() -#endif - const int under_mencoder = 0; int slave_mode=0; int player_idle_mode=0; @@ -149,7 +145,7 @@ char *heartbeat_cmd; static int cfg_inc_verbose(m_option_t *conf){ ++verbose; return 0;} -#include "get_path.h" +#include "path.h" //**************************************************************************// //**************************************************************************// @@ -3146,10 +3142,8 @@ int i; set_priority(); #endif -#ifdef CONFIG_WIN32DLL if (codec_path) - SetCodecPath(codec_path); -#endif + set_codec_path(codec_path); if(opts->video_driver_list && strcmp(opts->video_driver_list[0],"help")==0){ list_video_out(); |