Mercurial > mplayer.hg

comparison cfg-common.h @ 25230:66f140bbe1bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless ifdefs around extern declarations
author reimar
date Sun, 02 Dec 2007 16:08:07 +0000
parents d81eef9beb1b
children ee5eccc1206d
comparison
equal deleted inserted replaced
25229:4f611a555224 25230:66f140bbe1bc
355 extern int field_dominance; 355 extern int field_dominance;
356 356
357 /* from dec_audio, currently used for ac3surround decoder only */ 357 /* from dec_audio, currently used for ac3surround decoder only */
358 extern int audio_output_channels; 358 extern int audio_output_channels;
359 359
360 #ifdef MPLAYER_NETWORK
361 /* defined in network.c */ 360 /* defined in network.c */
362 extern char *network_username; 361 extern char *network_username;
363 extern char *network_password; 362 extern char *network_password;
364 extern int network_bandwidth; 363 extern int network_bandwidth;
365 extern char *network_useragent; 364 extern char *network_useragent;
368 367
369 extern int network_prefer_ipv4; 368 extern int network_prefer_ipv4;
370 extern int network_ipv4_only_proxy; 369 extern int network_ipv4_only_proxy;
371 extern int reuse_socket; 370 extern int reuse_socket;
372 371
373 #endif
374
375 #ifdef USE_DVDREAD
376 extern int dvd_speed; /* stream/stream_dvd.c */ 372 extern int dvd_speed; /* stream/stream_dvd.c */
377 #endif
378 373
379 extern float a52_drc_level; 374 extern float a52_drc_level;
380 375
381 /* defined in libmpdemux: */ 376 /* defined in libmpdemux: */
382 extern int hr_mp3_seek; 377 extern int hr_mp3_seek;
509 #ifdef HAS_DVBIN_SUPPORT 504 #ifdef HAS_DVBIN_SUPPORT
510 #include "stream/dvbin.h" 505 #include "stream/dvbin.h"
511 extern m_config_t dvbin_opts_conf[]; 506 extern m_config_t dvbin_opts_conf[];
512 #endif 507 #endif
513 508
514 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
515 extern m_option_t lavfdopts_conf[]; 509 extern m_option_t lavfdopts_conf[];
516 #endif 510
517
518 #ifdef STREAMING_LIVE555
519 extern int rtspStreamOverTCP; 511 extern int rtspStreamOverTCP;
520 #endif
521 #ifdef LIBNEMESI
522 extern int rtsp_transport_tcp; 512 extern int rtsp_transport_tcp;
523 extern int rtsp_transport_sctp; 513 extern int rtsp_transport_sctp;
524 #endif
525 extern int rtsp_port; 514 extern int rtsp_port;
526 extern char *rtsp_destination; 515 extern char *rtsp_destination;
527 516
528 517
529 extern int audio_stream_cache; 518 extern int audio_stream_cache;
712 { "idle", IDLE_PRIORITY_CLASS}, 701 { "idle", IDLE_PRIORITY_CLASS},
713 { NULL, NORMAL_PRIORITY_CLASS} /* default */ 702 { NULL, NORMAL_PRIORITY_CLASS} /* default */
714 }; 703 };
715 #endif /* WIN32 */ 704 #endif /* WIN32 */
716 705
717 #ifdef USE_LIBAVCODEC
718 extern m_option_t lavc_decode_opts_conf[]; 706 extern m_option_t lavc_decode_opts_conf[];
719 #endif
720
721 #if defined(HAVE_XVID3) || defined(HAVE_XVID4)
722 extern m_option_t xvid_dec_opts[]; 707 extern m_option_t xvid_dec_opts[];
723 #endif
724 708
725 int dvd_parse_chapter_range(m_option_t*, const char*); 709 int dvd_parse_chapter_range(m_option_t*, const char*);
726 710
727 #endif /* MAIN_CONF */ 711 #endif /* MAIN_CONF */