summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--mp-opt-reg.c18
-rw-r--r--mplayer.c3
3 files changed, 22 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index daf529c4bc..76f9fdcf61 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ INSTALL = install
SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c roqav.c qtrpza.c
SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c
-SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c vobsub.c
+SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c vobsub.c mp-opt-reg.c
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
diff --git a/mp-opt-reg.c b/mp-opt-reg.c
new file mode 100644
index 0000000000..10690be18b
--- /dev/null
+++ b/mp-opt-reg.c
@@ -0,0 +1,18 @@
+
+#include "config.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include "cfgparser.h"
+
+#ifdef HAVE_NEW_INPUT
+extern void mp_input_register_options(m_config_t* cfg);
+#endif
+
+void
+mp_register_options(m_config_t* cfg) {
+
+#ifdef HAVE_NEW_INPUT
+ mp_input_register_options(cfg);
+#endif
+
+}
diff --git a/mplayer.c b/mplayer.c
index 229b5c32f2..303e5d9322 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -391,6 +391,8 @@ void exit_sighandler(int x){
//extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);
+extern void mp_register_options(m_config_t* cfg);
+
#include "mixer.h"
#include "cfg-mplayer.h"
@@ -525,6 +527,7 @@ vo_tune_info_t vtune;
mconfig = m_config_new(playtree);
m_config_register_options(mconfig,mplayer_opts);
// TODO : add something to let modules register their options
+ mp_register_options(mconfig);
parse_cfgfiles(mconfig);