* Backported fixes from MAIN.

diff --git a/ChangeLog b/ChangeLog
index 81a7dc341b83b883d2a116dabe7e0a0c4f9a7b40..e7cd07dd2a57d33e656303fb62add4e97b13625d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,12 @@
 
 HEAD
 
+  * ./plugins/macosx/intf_vlc_wrapper.m: fix for non-ASCII filenames in the
+    MacOS X interface, courtesy of Watanabe Go <go@dsl.gr.jp>.
+  * ./plugins/chroma/i420_yuy2.h: fixed an old overflow bug spotted by
+    Rudolf Cornelissen.
+  * ./plugins/chroma/i420_rgb16.c: fix for skewed display in software RV32
+    mode, courtesy of Pascal Levesque.
   * ./plugins/beos/InterfaceWindow.h: stopped more than one playlist being
     opened.
   * ./plugins/beos/InterfaceWindow.cpp: fixed segfault on exit with playlist

diff --git a/plugins/chroma/i420_yuy2.h b/plugins/chroma/i420_yuy2.h
index 170fdce7a5898d51d62ea1aba8f33538c5d9c693..69336e669a6e8d2a4895987dc86071341bbbc1b8 100644 (file)
--- a/plugins/chroma/i420_yuy2.h
+++ b/plugins/chroma/i420_yuy2.h
@@ -2,7 +2,7 @@
  * i420_yuy2.h : YUV to YUV conversion module for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: i420_yuy2.h,v 1.6 2002/05/22 21:05:18 sam Exp $
+ * $Id: i420_yuy2.h,v 1.6.2.1 2002/06/01 11:38:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -37,12 +37,12 @@ movl      %%ebx,%9                                                        \n\
 "
 
 #define MMX_INC "                                                         \n\
-addl         $8, %0                                                       \n\
-addl         $8, %1                                                       \n\
-addl         $4, %2                                                       \n\
-addl         $4, %3                                                       \n\
-addl         $2, %%eax                                                    \n\
-addl         $2, %%ebx                                                    \n\
+addl         $16, %0                                                      \n\
+addl         $16, %1                                                      \n\
+addl         $8, %2                                                       \n\
+addl         $8, %3                                                       \n\
+addl         $4, %%eax                                                    \n\
+addl         $4, %%ebx                                                    \n\
 "
 
 #define MMX_CALL(MMX_INSTRUCTIONS)                                  \
@@ -51,9 +51,6 @@ addl         $2, %%ebx                                                    \n\
         ".align 8 \n\t"                                             \
         MMX_INSTRUCTIONS                                            \
         MMX_INC                                                     \
-        ".align 8 \n\t"                                             \
-        MMX_INSTRUCTIONS                                            \
-        MMX_INC                                                     \
         MMX_SAVE                                                    \
         : "=c" (p_line1), "=d" (p_line2), "=D" (p_y1), "=S" (p_y2)  \
         :  "c" (p_line1),  "d" (p_line2),  "D" (p_y1),  "S" (p_y2), \

diff --git a/plugins/macosx/intf_vlc_wrapper.m b/plugins/macosx/intf_vlc_wrapper.m
index a565a3e9c15744825063f3e1a45b145dc3be7661..926030f771508e3fa38b798e5604ea79b5ee5fa0 100644 (file)
--- a/plugins/macosx/intf_vlc_wrapper.m
+++ b/plugins/macosx/intf_vlc_wrapper.m
@@ -2,7 +2,7 @@
  * intf_vlc_wrapper.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_vlc_wrapper.m,v 1.6 2002/05/19 23:51:37 massiot Exp $
+ * $Id: intf_vlc_wrapper.m,v 1.6.2.1 2002/06/01 11:38:07 sam Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -400,7 +400,7 @@ static Intf_VLCWrapper *o_intf = nil;
 - (void)playlistAdd:(NSString *)o_filename
 {
     intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, 
-                      [o_filename lossyCString] );
+                      [o_filename fileSystemRepresentation] );
 }
     
 - (void)clearPlaylist
@@ -429,7 +429,7 @@ static Intf_VLCWrapper *o_intf = nil;
     while( ( o_file = (NSString *)[o_enum nextObject] ) )
     {
         intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, 
-                          [o_file lossyCString] );
+                          [o_file fileSystemRepresentation] );
     }
 
     /* end current item, select first added item */
@@ -450,7 +450,7 @@ static Intf_VLCWrapper *o_intf = nil;
                     o_type, o_device, i_title, i_chapter];
 
     intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END,
-                      [o_source lossyCString] );
+                      [o_source fileSystemRepresentation] );
 
     /* stop current item, select added item */
     if( p_input_bank->pp_input[0] != NULL )
@@ -485,7 +485,7 @@ static Intf_VLCWrapper *o_intf = nil;
     }
 
     intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END,
-                      [o_source lossyCString] );
+                      [o_source fileSystemRepresentation] );
 
     intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 );
 }