mirror of
https://github.com/mpv-player/mpv
synced 2025-01-05 03:06:28 +01:00
Remove pointless ifdefs around extern declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25258 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
2e18988a04
commit
54016c6776
16
cfg-common.h
16
cfg-common.h
@ -357,7 +357,6 @@ extern int field_dominance;
|
||||
/* from dec_audio, currently used for ac3surround decoder only */
|
||||
extern int audio_output_channels;
|
||||
|
||||
#ifdef MPLAYER_NETWORK
|
||||
/* defined in network.c */
|
||||
extern char *network_username;
|
||||
extern char *network_password;
|
||||
@ -370,11 +369,7 @@ extern int network_prefer_ipv4;
|
||||
extern int network_ipv4_only_proxy;
|
||||
extern int reuse_socket;
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef USE_DVDREAD
|
||||
extern int dvd_speed; /* stream/stream_dvd.c */
|
||||
#endif
|
||||
|
||||
extern float a52_drc_level;
|
||||
|
||||
@ -511,17 +506,11 @@ m_option_t pvropts_conf[]={
|
||||
extern m_config_t dvbin_opts_conf[];
|
||||
#endif
|
||||
|
||||
#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
|
||||
extern m_option_t lavfdopts_conf[];
|
||||
#endif
|
||||
|
||||
#ifdef STREAMING_LIVE555
|
||||
extern int rtspStreamOverTCP;
|
||||
#endif
|
||||
#ifdef LIBNEMESI
|
||||
extern int rtsp_transport_tcp;
|
||||
extern int rtsp_transport_sctp;
|
||||
#endif
|
||||
extern int rtsp_port;
|
||||
extern char *rtsp_destination;
|
||||
|
||||
@ -714,13 +703,8 @@ struct {
|
||||
};
|
||||
#endif /* WIN32 */
|
||||
|
||||
#ifdef USE_LIBAVCODEC
|
||||
extern m_option_t lavc_decode_opts_conf[];
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
|
||||
extern m_option_t xvid_dec_opts[];
|
||||
#endif
|
||||
|
||||
int dvd_parse_chapter_range(m_option_t*, const char*);
|
||||
|
||||
|
@ -5,55 +5,26 @@
|
||||
|
||||
#include "cfg-common.h"
|
||||
|
||||
#ifdef USE_FAKE_MONO
|
||||
extern int fakemono; // defined in dec_audio.c
|
||||
#endif
|
||||
|
||||
extern int sws_flags;
|
||||
extern int readPPOpt(void *, char *arg);
|
||||
extern void revertPPOpt(void *conf, char* opt);
|
||||
extern char *pp_help;
|
||||
|
||||
#ifdef HAVE_MP3LAME
|
||||
extern m_option_t lameopts_conf[];
|
||||
#endif
|
||||
|
||||
#ifdef USE_LIBAVCODEC
|
||||
extern m_option_t lavcopts_conf[];
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_TOOLAME
|
||||
extern m_option_t toolameopts_conf[];
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_TWOLAME
|
||||
extern m_option_t twolameopts_conf[];
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_FAAC
|
||||
extern m_option_t faacopts_conf[];
|
||||
#endif
|
||||
|
||||
#ifdef USE_WIN32DLL
|
||||
extern m_option_t vfwopts_conf[];
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
|
||||
extern m_option_t xvidencopts_conf[];
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_X264)
|
||||
extern void x264enc_set_param(m_option_t* opt, char* arg);
|
||||
#endif
|
||||
|
||||
#ifdef USE_LIBLZO
|
||||
extern m_option_t nuvopts_conf[];
|
||||
#endif
|
||||
|
||||
extern m_option_t mpegopts_conf[];
|
||||
#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
|
||||
extern m_option_t lavfopts_conf[];
|
||||
#endif
|
||||
|
||||
m_option_t ovc_conf[]={
|
||||
{"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY, NULL},
|
||||
|
@ -7,20 +7,12 @@
|
||||
extern int key_fifo_size;
|
||||
extern unsigned doubleclick_time;
|
||||
|
||||
#ifdef HAVE_FBDEV
|
||||
extern char *fb_mode_cfgfile;
|
||||
extern char *fb_mode_name;
|
||||
#endif
|
||||
#ifdef HAVE_DIRECTFB
|
||||
extern char *dfb_params;
|
||||
#endif
|
||||
#ifdef USE_FAKE_MONO
|
||||
extern int fakemono; // defined in dec_audio.c
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIRC
|
||||
extern char *lirc_configfile;
|
||||
#endif
|
||||
|
||||
extern float vo_panscanrange;
|
||||
/* only used at startup (setting these values from configfile) */
|
||||
@ -34,35 +26,23 @@ extern int vidmode;
|
||||
extern char *ao_outputfilename;
|
||||
extern int ao_pcm_waveheader;
|
||||
|
||||
#ifdef HAVE_X11
|
||||
extern int fs_layer;
|
||||
extern int stop_xscreensaver;
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_MENU
|
||||
extern int menu_startup;
|
||||
extern int menu_keepdir;
|
||||
extern char *menu_chroot;
|
||||
#ifdef USE_FRIBIDI
|
||||
extern char *menu_fribidi_charset;
|
||||
extern int menu_flip_hebrew;
|
||||
extern int menu_fribidi_flip_commas;
|
||||
#endif
|
||||
#endif /* HAVE_MENU */
|
||||
|
||||
#ifdef HAVE_ZR
|
||||
extern int vo_zr_parseoption(m_option_t* conf, char *opt, char * param);
|
||||
extern void vo_zr_revertoption(m_option_t* opt,char* pram);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_DXR2
|
||||
extern m_option_t dxr2_opts[];
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_NEW_GUI
|
||||
extern char * skinName;
|
||||
extern int guiWinID;
|
||||
#endif
|
||||
|
||||
|
||||
/* from libvo/aspect.c */
|
||||
|
Loading…
Reference in New Issue
Block a user