. corrections de fautes d'orthographe je ne sais plus trop o�

 . quelques bidouilles dans vout_mga mais de toute fa�on ce n'est pas
  pr�t de changer et on aura chang� la structure bien avant

 . encore un meilleur support des sous-titres

 . exemple d'input fichier dans le vlc.channels, � adapter � votre
  convenance

diff --git a/Makefile.in b/Makefile.in
index 75e488a045244770d9fcc5ae74be55f58da412c0..2f9fa13c9c36683f71bc231de5ed5f2f025c3b7e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,12 +20,13 @@ AOUT += dsp
 AOUT += dummy
 
 # Video output settings
-#VOUT += x11
+VOUT += x11
 #VOUT += fb
 #VOUT += ggi
 #VOUT += glide
-# Not yet supported
 #VOUT += gnome
+# Not yet supported
+#VOUT += mga
 #VOUT += beos
 #VOUT += dga
 # Fallback method that should always work
@@ -36,8 +37,9 @@ INTF += x11
 #INTF += fb
 #INTF += ggi
 #INTF += glide
-# Not yet supported
 #INTF += gnome
+# Not yet supported
+#INTF += mga
 #INTF += beos
 #INTF += dga
 # Fallback method that should always work
@@ -451,6 +453,10 @@ plugins/intf/intf_x11.so plugins/vout/vout_x11.so: %.so: %.c
                @echo "compiling $*.so from $*.c"
                @$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -lXext -shared -o $@ $<
 
+plugins/intf/intf_mga.so plugins/vout/vout_mga.so: %.so: %.c
+               @echo "compiling $*.so from $*.c"
+               @$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -lXext -shared -o $@ $<
+
 plugins/intf/intf_gnome.so: %.so: %.c
                @echo "compiling $*.so from $*.c"
                @$(CC) $(CCFLAGS) $(CFLAGS) $(LCFLAGS) `gnome-config --libs --cflags gnomeui` -shared -o $@ $< plugins/intf/intf_gnome_callbacks.c plugins/intf/intf_gnome_interface.c plugins/intf/intf_gnome_support.c

diff --git a/src/spu_decoder/spu_decoder.c b/src/spu_decoder/spu_decoder.c
index 03530d3da1c5765d7fad40ecdf51c72bcebad7ed..09aa00dc3943550ea5af43b25ffe861cee2a79ab 100644 (file)
--- a/src/spu_decoder/spu_decoder.c
+++ b/src/spu_decoder/spu_decoder.c
@@ -255,6 +255,7 @@ static void RunThread( spudec_thread_t *p_spudec )
                 while( i_index++ < i_rle_size )
                 {
                     /* skip the leading byte of a PES */
+                    /* FIXME: this part definitely looks strange */
                     if ( !((i_index + 3) % i_pes_size) )
                     {
                         i_pes_count++;
@@ -288,20 +289,16 @@ static void RunThread( spudec_thread_t *p_spudec )
                                 /* 00 (force displaying) */
                                 break;
                             /* FIXME: here we have to calculate dates. It's
-                             * around i_date * 1000000 / 83 but I don't know
-                             * how much exactly. Here are my findings :
-                             *
-                             * - 80 is too small ( Lain Deus, VTS_01_2.VOB )
-                             *  -> 82 seems to be the minimum, 83 is fine.
-                             *
+                             * around i_date * 10000 but I don't know
+                             * how much exactly.
                              */
                             case 0x01:
                                 /* 01 (start displaying) */
-                                p_spu->begin_date += ( i_date * 1000000 / 83 );
+                                p_spu->begin_date += ( i_date * 10000 );
                                 break;
                             case 0x02:
                                 /* 02 (stop displaying) */
-                                p_spu->end_date += ( i_date * 1000000 / 83 );
+                                p_spu->end_date += ( i_date * 10000 );
                                 break;
                             case 0x03:
                                 /* 03xxxx (palette) */

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index e8dd110669587febd004a921f9d6cd22b37b13d3..d29f1cbdd2652913b08b8229839903b08e5972bf 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1649,8 +1649,8 @@ static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic )
     /* Get and set rendering informations */
     p_buffer =          &p_vout->p_buffer[ p_vout->i_buffer_index ];
     p_pic_data =        p_buffer->p_data +
-        p_buffer->i_pic_x * p_vout->i_bytes_per_pixel +
-        p_buffer->i_pic_y * p_vout->i_bytes_per_line;
+                        p_buffer->i_pic_x * p_vout->i_bytes_per_pixel +
+                        p_buffer->i_pic_y * p_vout->i_bytes_per_line;
 #ifdef DEBUG_VIDEO
     render_time = mdate();
 #endif

diff --git a/src/video_parser/video_parser.c b/src/video_parser/video_parser.c
index c7236d951df27a7fec6e5509910b21b4e4659a04..fa13f31ee0a07b523b0c437a60b7df4843c23e7d 100644 (file)
--- a/src/video_parser/video_parser.c
+++ b/src/video_parser/video_parser.c
@@ -341,7 +341,7 @@ static int InitThread( vpar_thread_t *p_vpar )
 /*****************************************************************************
  * RunThread: generic parser thread
  *****************************************************************************
- * Video parser thread. This function does only returns when the thread is
+ * Video parser thread. This function only returns when the thread is
  * terminated.
  *****************************************************************************/
 static void RunThread( vpar_thread_t *p_vpar )

diff --git a/vlc.channels b/vlc.channels
index 776f3b436236001529e5ea55d4410f879666dde6..8e66385c32011b9a1f91cf4f1ebf3d55aea524f7 100644 (file)
--- a/vlc.channels
+++ b/vlc.channels
@@ -1,3 +1,4 @@
 0;Ptyx (caribou);20;caribou.via.ecp.fr;
 1;Sam (bofh);20;bofh.via.ecp.fr;
 2;Polux (dressler);20;dressler.via.ecp.fr;
+#3;File;10;/home/sam/videolan/flux/bandesannonce.vob;