summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-23 17:21:01 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-23 17:21:01 +0000
commitf9e3a4bf886ebfd865e6ffba7edc9c0a6f114b42 (patch)
tree8db9d460c3bea1a734a69a2740f25de72310c2d0 /mencoder.c
parenta2dfc7a766c2f00408671327838602eebcc4cddf (diff)
downloadmpv-f9e3a4bf886ebfd865e6ffba7edc9c0a6f114b42.tar.bz2
mpv-f9e3a4bf886ebfd865e6ffba7edc9c0a6f114b42.tar.xz
cleanup config option handling in libmpdemux.
removed overcompilacted m_config_register_options() mess - export the subconfig structs instead git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7868 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/mencoder.c b/mencoder.c
index a3c21a21ab..fd57a6f576 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -77,7 +77,7 @@ int vo_config_count=0;
//--------------------------
// cache2:
-static int stream_cache_size=0;
+int stream_cache_size=0;
#ifdef USE_STREAM_CACHE
extern int cache_fill_status;
#else
@@ -269,8 +269,6 @@ static int dec_audio(sh_audio_t *sh_audio,unsigned char* buffer,int total){
return size;
}
-extern void me_register_options(m_config_t* cfg);
-
//---------------------------------------------------------------------------
static int at_eof=0;
@@ -370,7 +368,6 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
playtree = play_tree_new();
mconfig = m_config_new(playtree);
m_config_register_options(mconfig,mencoder_opts);
- me_register_options(mconfig);
parse_cfgfiles(mconfig);
if(m_config_parse_command_line(mconfig, argc, argv) < 0) mencoder_exit(1, "error parsing cmdline");