--- stream/stream.dvb.c.old	2008-10-07 04:04:13.000000000 +0300
+++ stream/stream_dvb.c	2008-10-19 11:28:53.000000000 +0300
@@ -323,7 +323,10 @@
 				ptr->mod = VSB_8;
 			else if(! strcmp(mod, "VSB_16") || !strcmp(mod, "16VSB"))
 				ptr->mod = VSB_16;
-
+#endif
+			else
+				ptr->mod = QAM_AUTO;
+#ifdef DVB_ATSC
 			ptr->inv = INVERSION_AUTO;
 #endif
 		}
@@ -342,6 +345,8 @@
 				ptr->trans = TRANSMISSION_MODE_2K;
 			else if(! strcmp(transm, "TRANSMISSION_MODE_8K"))
 				ptr->trans = TRANSMISSION_MODE_8K;
+			else
+				ptr->trans = TRANSMISSION_MODE_AUTO;
 
 
 			if(! strcmp(gi, "GUARD_INTERVAL_1_32"))
@@ -350,7 +355,10 @@
 				ptr->gi = GUARD_INTERVAL_1_16;
 			else if(! strcmp(gi, "GUARD_INTERVAL_1_8"))
 				ptr->gi = GUARD_INTERVAL_1_8;
-			else ptr->gi = GUARD_INTERVAL_1_4;
+			else if(! strcmp(gi, "GUARD_INTERVAL_1_4"))
+				ptr->gi = GUARD_INTERVAL_1_4;
+			else
+				ptr->gi = GUARD_INTERVAL_AUTO;
 			
 			if(! strcmp(tmp_lcr, "FEC_1_2"))
 				ptr->cr_lp =FEC_1_2;