[MPlayer-cvslog] r19089 - trunk/libmpdemux/dvb_defaults.h

[nicodvb]

Author: nicodvb
Date: Fri Jul 14 23:54:24 2006
New Revision: 19089

Modified:
   trunk/libmpdemux/dvb_defaults.h

Log:
removed never used macros; patch by zzam gentoo org (Matthias Schwarzott)

Modified: trunk/libmpdemux/dvb_defaults.h
==============================================================================
--- trunk/libmpdemux/dvb_defaults.h	(original)
+++ trunk/libmpdemux/dvb_defaults.h	Fri Jul 14 23:54:24 2006
@@ -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