diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-14 21:54:24 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-14 21:54:24 +0000 |
| commit | 95c4abd4222c6c13ec4d52f621de1b51e8abfd99 (patch) | |
| tree | 47431e7be0cab481113fba589feae7396129939b /libmpdemux | |
| parent | b01075190b20a9f362ce869e3d0a1c771fd474d4 (diff) | |
| download | mpv-95c4abd4222c6c13ec4d52f621de1b51e8abfd99.tar.bz2 mpv-95c4abd4222c6c13ec4d52f621de1b51e8abfd99.tar.xz | |
removed never used macros; patch by zzam gentoo org (Matthias Schwarzott)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19089 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/dvb_defaults.h | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/libmpdemux/dvb_defaults.h b/libmpdemux/dvb_defaults.h index 4af0af45cf..9e746180a7 100644 --- a/libmpdemux/dvb_defaults.h +++ b/libmpdemux/dvb_defaults.h @@ -37,55 +37,4 @@ #define LOF1 (9750*1000UL) #define LOF2 (10600*1000UL) - - -#ifdef FINLAND - /* FINLAND settings 1 */ - #define DVB_T_LOCATION "Suomessa" - #define BANDWIDTH_DEFAULT BANDWIDTH_8_MHZ - #define HP_CODERATE_DEFAULT FEC_2_3 - #define CONSTELLATION_DEFAULT QAM_64 - #define TRANSMISSION_MODE_DEFAULT TRANSMISSION_MODE_8K - #define GUARD_INTERVAL_DEFAULT GUARD_INTERVAL_1_8 - #define HIERARCHY_DEFAULT HIERARCHY_NONE -#endif - - -#ifdef FINLAND2 - /* FINLAND settings 2 (someone verify there is such environment) */ - #define DVB_T_LOCATION "Suomessa II" - #define BANDWIDTH_DEFAULT BANDWIDTH_8_MHZ - #define HP_CODERATE_DEFAULT FEC_1_2 - #define CONSTELLATION_DEFAULT QAM_64 - #define TRANSMISSION_MODE_DEFAULT TRANSMISSION_MODE_2K - #define GUARD_INTERVAL_DEFAULT GUARD_INTERVAL_1_8 - #define HIERARCHY_DEFAULT HIERARCHY_NONE -#endif - -#if defined (UK) && defined (HP_CODERATE_DEFAULT) - #error Multible countries defined -#endif - - - -#ifndef DVB_T_LOCATION - #ifndef UK - #warning No DVB-T country defined in dvb_defaults.h, defaulting to UK. Ignore this if using Satellite or Cable. - #endif - - /* UNITED KINGDOM settings */ - #define DVB_T_LOCATION "in United Kingdom" - #define BANDWIDTH_DEFAULT BANDWIDTH_8_MHZ - #define HP_CODERATE_DEFAULT FEC_2_3 - #define CONSTELLATION_DEFAULT QAM_64 - #define TRANSMISSION_MODE_DEFAULT TRANSMISSION_MODE_2K - #define GUARD_INTERVAL_DEFAULT GUARD_INTERVAL_1_32 - #define HIERARCHY_DEFAULT HIERARCHY_NONE -#endif - - -#if HIERARCHY_DEFAULT == HIERARCHY_NONE && !defined (LP_CODERATE_DEFAULT) - #define LP_CODERATE_DEFAULT (0) /* unused if HIERARCHY_NONE */ -#endif - #endif |