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 /mencoder.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 'mencoder.c')
| -rw-r--r-- | mencoder.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/mencoder.c b/mencoder.c index d449572851..dc3d8700a3 100644 --- a/mencoder.c +++ b/mencoder.c @@ -63,11 +63,7 @@ #include "parser-mecmd.h" #include "parser-cfg.h" #include "mp_fifo.h" -#include "get_path.h" - -#ifdef CONFIG_WIN32DLL -#include "loader/drv.h" // for SetCodecPath() -#endif +#include "path.h" #include "stream/stream.h" #include "libmpdemux/aviprint.h" @@ -341,7 +337,7 @@ static void exit_sighandler(int x){ static muxer_t* muxer=NULL; -void add_subtitles(char *filename, float fps, int silent) +static void add_subtitles(char *filename, float fps, int silent) { sub_data *subd; #ifdef CONFIG_ASS @@ -684,10 +680,8 @@ if (frameno_filename) { set_priority(); #endif -#ifdef CONFIG_WIN32DLL if (codec_path) - SetCodecPath(codec_path); -#endif + set_codec_path(codec_path); // check font #ifdef CONFIG_FREETYPE |