Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv21482 Modified Files: Makefile mencoder.c Added Files: me-opt-reg.c Log Message: Options registration for mencoder --- NEW FILE --- #include "config.h" #include <stdlib.h> #include <stdio.h> #include "cfgparser.h" extern void libmpdemux_register_options(m_config_t* cfg); void me_register_options(m_config_t* cfg) { libmpdemux_register_options(cfg); } Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- Makefile 11 Feb 2002 11:46:27 -0000 1.154 +++ Makefile 20 Feb 2002 17:02:31 -0000 1.155 @@ -28,7 +28,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_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c me-opt-reg.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) Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- mencoder.c 18 Feb 2002 20:17:36 -0000 1.90 +++ mencoder.c 20 Feb 2002 17:02:31 -0000 1.91 @@ -341,6 +341,8 @@ return size; } +extern void me_register_options(m_config_t* cfg); + //--------------------------------------------------------------------------- static int eof=0; @@ -443,7 +445,7 @@ playtree = play_tree_new(); mconfig = m_config_new(playtree); m_config_register_options(mconfig,mencoder_opts); - // TODO : add something to let modules register their options + me_register_options(mconfig); parse_cfgfiles(mconfig); if(m_config_parse_command_line(mconfig, argc, argv, envp) < 0) mencoder_exit(1, "error parsing cmdline");