summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:00:06 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:00:06 +0200
commitc37f09693d0edb632c80f8f38ecdb2faf3547f7f (patch)
tree44df07eacb522a97bbecd7a3a0f93e8d6a933003 /cfg-mplayer.h
parent22a06c4ae5672c1dd629918d0a279b8af24e35c3 (diff)
parent2aafb808284d74edab6e5320e1114f5c74d5881e (diff)
downloadmpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.bz2
mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.xz
Merge svn changes up to r30643
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index d8170ec9e7..962d8eb3be 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -26,6 +26,7 @@
#include <stddef.h>
#include "cfg-common.h"
+#include "libvo/vo_zr.h"
#include "options.h"
extern char *fb_mode_cfgfile;
@@ -52,14 +53,9 @@ extern int menu_fribidi_flip_commas;
extern char *unrar_executable;
-int vo_zr_parseoption(const m_option_t* conf, char *opt, char * param);
-void vo_zr_revertoption(const m_option_t* opt,char* pram);
-
extern m_option_t dxr2_opts[];
extern int sws_flags;
-int readPPOpt(void *conf, char *arg);
-void revertPPOpt(void *conf, char* opt);
extern char* pp_help;
const m_option_t vd_conf[]={