Commit b1d89b15 authored by Sam Hocevar's avatar Sam Hocevar

* Backported fixes from MAIN.

parent e4f6c3c4
...@@ -4,6 +4,12 @@ ...@@ -4,6 +4,12 @@
HEAD 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 * ./plugins/beos/InterfaceWindow.h: stopped more than one playlist being
opened. opened.
* ./plugins/beos/InterfaceWindow.cpp: fixed segfault on exit with playlist * ./plugins/beos/InterfaceWindow.cpp: fixed segfault on exit with playlist
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* i420_yuy2.h : YUV to YUV conversion module for vlc * i420_yuy2.h : YUV to YUV conversion module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -37,12 +37,12 @@ movl %%ebx,%9 \n\ ...@@ -37,12 +37,12 @@ movl %%ebx,%9 \n\
" "
#define MMX_INC " \n\ #define MMX_INC " \n\
addl $8, %0 \n\ addl $16, %0 \n\
addl $8, %1 \n\ addl $16, %1 \n\
addl $4, %2 \n\ addl $8, %2 \n\
addl $4, %3 \n\ addl $8, %3 \n\
addl $2, %%eax \n\ addl $4, %%eax \n\
addl $2, %%ebx \n\ addl $4, %%ebx \n\
" "
#define MMX_CALL(MMX_INSTRUCTIONS) \ #define MMX_CALL(MMX_INSTRUCTIONS) \
...@@ -51,9 +51,6 @@ addl $2, %%ebx \n\ ...@@ -51,9 +51,6 @@ addl $2, %%ebx \n\
".align 8 \n\t" \ ".align 8 \n\t" \
MMX_INSTRUCTIONS \ MMX_INSTRUCTIONS \
MMX_INC \ MMX_INC \
".align 8 \n\t" \
MMX_INSTRUCTIONS \
MMX_INC \
MMX_SAVE \ 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) \
: "c" (p_line1), "d" (p_line2), "D" (p_y1), "S" (p_y2), \ : "c" (p_line1), "d" (p_line2), "D" (p_y1), "S" (p_y2), \
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_vlc_wrapper.c: MacOS X plugin for vlc * intf_vlc_wrapper.c: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -400,7 +400,7 @@ static Intf_VLCWrapper *o_intf = nil; ...@@ -400,7 +400,7 @@ static Intf_VLCWrapper *o_intf = nil;
- (void)playlistAdd:(NSString *)o_filename - (void)playlistAdd:(NSString *)o_filename
{ {
intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END,
[o_filename lossyCString] ); [o_filename fileSystemRepresentation] );
} }
- (void)clearPlaylist - (void)clearPlaylist
...@@ -429,7 +429,7 @@ static Intf_VLCWrapper *o_intf = nil; ...@@ -429,7 +429,7 @@ static Intf_VLCWrapper *o_intf = nil;
while( ( o_file = (NSString *)[o_enum nextObject] ) ) while( ( o_file = (NSString *)[o_enum nextObject] ) )
{ {
intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END,
[o_file lossyCString] ); [o_file fileSystemRepresentation] );
} }
/* end current item, select first added item */ /* end current item, select first added item */
...@@ -450,7 +450,7 @@ static Intf_VLCWrapper *o_intf = nil; ...@@ -450,7 +450,7 @@ static Intf_VLCWrapper *o_intf = nil;
o_type, o_device, i_title, i_chapter]; o_type, o_device, i_title, i_chapter];
intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END,
[o_source lossyCString] ); [o_source fileSystemRepresentation] );
/* stop current item, select added item */ /* stop current item, select added item */
if( p_input_bank->pp_input[0] != NULL ) if( p_input_bank->pp_input[0] != NULL )
...@@ -485,7 +485,7 @@ static Intf_VLCWrapper *o_intf = nil; ...@@ -485,7 +485,7 @@ static Intf_VLCWrapper *o_intf = nil;
} }
intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END,
[o_source lossyCString] ); [o_source fileSystemRepresentation] );
intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 ); intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment