[MPlayer-cvslog] r26155 - trunk/stream/stream_dvb.c

[nicodvb]

Author: nicodvb
Date: Mon Mar  3 23:28:07 2008
New Revision: 26155

Log:
search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com

Modified:
   trunk/stream/stream_dvb.c

Modified: trunk/stream/stream_dvb.c
==============================================================================
--- trunk/stream/stream_dvb.c	(original)
+++ trunk/stream/stream_dvb.c	Mon Mar  3 23:28:07 2008
@@ -815,6 +815,12 @@ dvb_config_t *dvb_get_config(void)
 			if(conf_file)
 				free(conf_file);
 			conf_file = get_path("channels.conf");
+			if((access(conf_file, F_OK | R_OK) != 0))
+			{
+				if(conf_file)
+					free(conf_file);
+				conf_file = strdup(MPLAYER_CONFDIR "/channels.conf");
+			}
 		}
 
 		list = dvb_get_channels(conf_file, type);