Merge changes happened in 1.1 development.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c
index c6a234ae5..d1bd2bc1d 100644
--- a/src/xine-engine/demux.c
+++ b/src/xine-engine/demux.c
@@ -20,7 +20,7 @@
  * Demuxer helper functions
  * hide some xine engine details from demuxers and reduce code duplication
  *
- * $Id: demux.c,v 1.64 2006/08/13 23:51:34 miguelfreitas Exp $ 
+ * $Id: demux.c,v 1.66 2007/01/18 23:28:46 dgp85 Exp $ 
  */
 
 
@@ -336,7 +336,7 @@ static void *demux_loop (void *stream_gen) {
     finished_count_video = stream->finished_count_video + 1;
   pthread_mutex_unlock (&stream->counter_lock);
 
-  /* demux_thread_running is zero if demux loop has being stopped by user */
+  /* demux_thread_running is zero if demux loop has been stopped by user */
   non_user = stream->demux_thread_running;
   stream->demux_thread_running = 0;
   
@@ -448,7 +448,7 @@ int _x_demux_read_header( input_plugin_t *input, unsigned char *buffer, off_t si
   return read_size;
 }
 
-int _x_demux_check_extension (char *mrl, char *extensions){
+int _x_demux_check_extension (const char *mrl, const char *extensions){
   char *last_dot, *e, *ext_copy, *ext_work;
 
   ext_copy = strdup(extensions);