diff options
| author | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-31 15:04:18 +0000 |
|---|---|---|
| committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-31 15:04:18 +0000 |
| commit | a63ea1a018ca781936dc0d4663b249676382844f (patch) | |
| tree | fc476b9b3221705be7aad9d935edec29c2b0b0b6 /mencoder.c | |
| parent | dc1ccbc50e06a6f87381c6a08bf6f2f79d5eeb25 (diff) | |
| download | mpv-a63ea1a018ca781936dc0d4663b249676382844f.tar.bz2 mpv-a63ea1a018ca781936dc0d4663b249676382844f.tar.xz | |
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
Patch by Donnie Smith <xc0bead2d8130df59@f4n.org>, updated by me.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7202 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index 949aad3d01..1f9208a9b2 100644 --- a/mencoder.c +++ b/mencoder.c @@ -295,7 +295,7 @@ void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags){ } -int main(int argc,char* argv[], char *envp[]){ +int main(int argc,char* argv[]){ stream_t* stream=NULL; demuxer_t* demuxer=NULL; @@ -373,7 +373,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ me_register_options(mconfig); parse_cfgfiles(mconfig); - if(m_config_parse_command_line(mconfig, argc, argv, envp) < 0) mencoder_exit(1, "error parsing cmdline"); + if(m_config_parse_command_line(mconfig, argc, argv) < 0) mencoder_exit(1, "error parsing cmdline"); playtree = play_tree_cleanup(playtree); if(playtree) { playtree_iter = play_tree_iter_new(playtree,mconfig); |