From 0864f92e7a55b20a21fc2f5eaf9e72cb799a6f7d Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 3 Dec 2008 23:01:03 +0000 Subject: Get rid of pointless 'extern' keywords. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-mencoder.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cfg-mencoder.h') diff --git a/cfg-mencoder.h b/cfg-mencoder.h index d4509c4711..2bfbca1336 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -8,8 +8,8 @@ #include "cfg-common.h" extern int sws_flags; -extern int readPPOpt(void *, char *arg); -extern void revertPPOpt(void *conf, char* opt); +int readPPOpt(void *, char *arg); +void revertPPOpt(void *conf, char* opt); extern char *pp_help; extern m_option_t lameopts_conf[]; @@ -20,7 +20,7 @@ extern m_option_t faacopts_conf[]; extern m_option_t vfwopts_conf[]; extern m_option_t xvidencopts_conf[]; -extern void x264enc_set_param(const m_option_t* opt, char* arg); +void x264enc_set_param(const m_option_t* opt, char* arg); extern m_option_t nuvopts_conf[]; extern m_option_t mpegopts_conf[]; @@ -155,8 +155,8 @@ const m_option_t of_conf[]={ {NULL, NULL, 0, 0, 0, 0, NULL} }; -extern float avi_aspect_override; /* defined in libmpdemux/muxer_avi.c */ -extern int write_odml; /* defined in libmpdemux/muxer_avi.c */ +float avi_aspect_override; /* defined in libmpdemux/muxer_avi.c */ +int write_odml; /* defined in libmpdemux/muxer_avi.c */ const m_option_t mencoder_opts[]={ /* name, pointer, type, flags, min, max */ -- cgit v1.2.3 From 8c5889004f7ba9f6fcbca20a05a9301771348408 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 3 Dec 2008 23:43:58 +0000 Subject: Restore two mistakenly removed 'extern' keywords. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28087 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-mencoder.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cfg-mencoder.h') diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 2bfbca1336..36316ebfa0 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -155,8 +155,8 @@ const m_option_t of_conf[]={ {NULL, NULL, 0, 0, 0, 0, NULL} }; -float avi_aspect_override; /* defined in libmpdemux/muxer_avi.c */ -int write_odml; /* defined in libmpdemux/muxer_avi.c */ +extern float avi_aspect_override; /* defined in libmpdemux/muxer_avi.c */ +extern int write_odml; /* defined in libmpdemux/muxer_avi.c */ const m_option_t mencoder_opts[]={ /* name, pointer, type, flags, min, max */ -- cgit v1.2.3