[cvs-annodex] commit (/annodex):
AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff
AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff.files
andre
nobody at lists.annodex.net
Sun Feb 27 15:55:43 EST 2005
Update of /annodex (new revision 976)
Modified files:
AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff
AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff.files
Log Message:
AnnodexFirefoxExtension:
* Updated VLC diffs to include video display fixes for Mozilla Mac OS X plugin
Modified: AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff
===================================================================
--- AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff 2005-02-27 04:38:48 UTC (rev 975)
+++ AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff 2005-02-27 04:55:42 UTC (rev 976)
@@ -1,6 +1,6 @@
Index: vlc.win32.nsi
===================================================================
---- vlc.win32.nsi (revision 10044)
+--- vlc.win32.nsi (revision 10061)
+++ vlc.win32.nsi (working copy)
@@ -131,8 +131,8 @@
File vlc.exe.manifest
@@ -15,7 +15,7 @@
Index: configure.ac
===================================================================
---- configure.ac (revision 10044)
+--- configure.ac (revision 10061)
+++ configure.ac (working copy)
@@ -1,7 +1,7 @@
dnl Autoconf settings for vlc
@@ -43,7 +43,7 @@
+VLC_ADD_PLUGINS([playlist export sgimb m3u xtag])
VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo])
VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au])
- VLC_ADD_PLUGINS([access_file access_udp access_tcp access_http access_mms])
+ VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp access_http access_mms])
VLC_ADD_PLUGINS([access_ftp ipv4])
+VLC_ADD_PLUGINS([ogg vorbis theora cmml])
@@ -280,17 +280,7 @@
VLC_ADD_LDFLAGS([wingdi],[-lgdi32])
fi
if test "${SYS}" = "mingwce"; then
-@@ -3314,8 +3297,7 @@
- (test "${SYS}" = "darwin" || test "${enable_coreaudio}" = "yes")
- then
- AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
-- [ VLC_ADD_BUILTINS([coreaudio])
-- VLC_ADD_LDFLAGS([coreaudio],[-framework CoreAudio])
-+ [ VLC_ADD_LDFLAGS([coreaudio],[-framework CoreAudio])
- AC_MSG_CHECKING(for kAudioConverterPrimeMethod in AudioToolbox/AudioConverter.h)
- AC_EGREP_HEADER(kAudioConverterPrimeMethod,AudioToolbox/AudioConverter.h,[
- AC_MSG_RESULT(yes)
-@@ -3766,7 +3748,7 @@
+@@ -3766,7 +3749,7 @@
[ --enable-visual visualisation plugin (default enabled)])
if test "${enable_visual}" != "no"
then
@@ -299,7 +289,7 @@
fi
dnl
-@@ -3809,7 +3791,6 @@
+@@ -3809,7 +3792,6 @@
fi
if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then
AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a)
@@ -307,7 +297,7 @@
VLC_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2])
VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE])
else
-@@ -3818,7 +3799,6 @@
+@@ -3818,7 +3800,6 @@
AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
if test -f "${real_goom_tree}/libgoom.a"; then
AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
@@ -317,7 +307,7 @@
else
Index: mozilla/vlc.r
===================================================================
---- mozilla/vlc.r (revision 10044)
+--- mozilla/vlc.r (revision 10061)
+++ mozilla/vlc.r (working copy)
@@ -9,8 +9,8 @@
resource 'STR#' (126)
@@ -330,6 +320,15 @@
};
};
+@@ -18,7 +18,7 @@
+ resource 'STR#' (127)
+ {
+ {
+- "Invoke scriptable sample plugin"
++ "VLC Annodex viewer plugin<br><br>VideoLAN WWW: <a href=""http://www.videolan.org/"">http://www.videolan.org/</a><br>Annodex WWW: <a href=""http://www.annodex.net/"">http://www.annodex.net/</a>"
+ };
+ };
+
@@ -26,7 +26,7 @@
resource 'STR#' (128,"MIME Type")
{
@@ -341,7 +340,7 @@
Index: mozilla/npvlc_rc.rc
===================================================================
---- mozilla/npvlc_rc.rc (revision 10044)
+--- mozilla/npvlc_rc.rc (revision 10061)
+++ mozilla/npvlc_rc.rc (working copy)
@@ -31,17 +31,17 @@
BEGIN
@@ -371,7 +370,7 @@
BLOCK "VarFileInfo"
Index: mozilla/vlcplugin.h
===================================================================
---- mozilla/vlcplugin.h (revision 10044)
+--- mozilla/vlcplugin.h (revision 10061)
+++ mozilla/vlcplugin.h (working copy)
@@ -74,37 +74,13 @@
/*******************************************************************************
@@ -416,7 +415,7 @@
Index: mozilla/vlcshell.cpp
===================================================================
---- mozilla/vlcshell.cpp (revision 10044)
+--- mozilla/vlcshell.cpp (revision 10061)
+++ mozilla/vlcshell.cpp (working copy)
@@ -86,6 +86,7 @@
# define AOUT_PLUGINS "oss,dummy"
@@ -426,7 +425,53 @@
#endif
/*****************************************************************************
-@@ -314,12 +315,18 @@
+@@ -93,7 +94,7 @@
+ ******************************************************************************/
+ #ifdef XP_MACOSX
+ # define VOUT_PLUGINS "macosx"
+-# define AOUT_PLUGINS "macosx"
++# define AOUT_PLUGINS "coreaudio"
+
+ #endif
+
+@@ -196,7 +197,11 @@
+ if (pouetEvent->what == 6)
+ {
+ value.i_int = 1;
+- VLC_VariableSet( p_plugin->i_vlc, "drawableredraw", value );
++ if ( VLC_VariableSet( p_plugin->i_vlc, "drawableredraw", value ) !=
++ VLC_SUCCESS )
++ {
++ fprintf( stderr, "Setting drawableredraw failed" );
++ }
+ return true;
+ }
+
+@@ -279,17 +284,20 @@
+ char *home_user;
+ char *directory;
+ char *plugin_path;
+- char *ppsz_argv[] = { "vlc", "--plugin-path", NULL };
++ char *ppsz_argv[] = { "vlc", "-vv", "--plugin-path", NULL };
++ int i_plugin_path_length; /* minus the terminating \0 */
+
+ home_user = strdup( getenv("HOME") );
+ directory = strdup( "/Library/Internet Plug-Ins/VLC Plugin.plugin/"
+ "Contents/MacOS/modules" );
+- plugin_path = malloc( strlen( directory ) + strlen( home_user ) );
++ i_plugin_path_length = strlen( directory ) + strlen( home_user );
++ plugin_path = (char *) malloc( i_plugin_path_length + 1 );
+ memcpy( plugin_path , home_user , strlen(home_user) );
+ memcpy( plugin_path + strlen( home_user ) , directory ,
+ strlen( directory ) );
++ plugin_path[i_plugin_path_length] = '\0';
+
+- ppsz_argv[2] = plugin_path;
++ ppsz_argv[3] = plugin_path;
+
+ #elif defined(XP_WIN)
+ char *ppsz_argv[] = { NULL, "-vv" };
+@@ -314,12 +322,18 @@
if( !ppsz_argv[0] ) ppsz_argv[0] = "vlc";
#else
@@ -450,7 +495,32 @@
#endif
i_ret = VLC_Init( p_plugin->i_vlc, sizeof(ppsz_argv)/sizeof(char*),
-@@ -636,21 +643,28 @@
+@@ -518,7 +532,7 @@
+ #if USE_LIBVLC
+
+ #ifdef XP_MACOSX
+- value.i_int = ((NP_Port*) (window->window))->port;
++ value.i_int = (int) ((NP_Port*) (window->window))->port;
+ VLC_VariableSet( p_plugin->i_vlc, "drawable", value );
+
+ valueportx.i_int = ((NP_Port*) (window->window))->portx;
+@@ -548,6 +562,7 @@
+
+ /* draw the beautiful "No Picture" */
+
++#if 0
+ black_rect.top = valuet.i_int - valuey.i_int;
+ black_rect.left = valuel.i_int - valuex.i_int;
+ black_rect.bottom = valueb.i_int - valuey.i_int;
+@@ -564,6 +579,7 @@
+ MoveTo( valuew.i_int / 2 - 40 , valueh.i_int / 2 );
+ DrawText( text , 0 , strlen(text) );
+ free(text);
++#endif
+
+ #else
+ /* FIXME: this cast sucks */
+@@ -636,21 +652,28 @@
UpdateWindow( p_plugin->p_hwnd );
#endif
@@ -484,7 +554,7 @@
if( !p_plugin->b_stream )
{
int i_mode = PLAYLIST_APPEND;
-@@ -892,6 +906,11 @@
+@@ -892,6 +915,11 @@
GC gc;
XGCValues gcv;
@@ -496,7 +566,7 @@
gcv.foreground = BlackPixel( p_plugin->p_display, 0 );
gc = XCreateGC( p_plugin->p_display, p_plugin->window, GCForeground, &gcv );
-@@ -907,5 +926,71 @@
+@@ -907,5 +935,71 @@
XFreeGC( p_plugin->p_display, gc );
}
@@ -568,3 +638,374 @@
+
+#endif
+
+Index: modules/gui/macosx/vout.m
+===================================================================
+--- modules/gui/macosx/vout.m (revision 10061)
++++ modules/gui/macosx/vout.m (working copy)
+@@ -48,25 +48,31 @@
+ - (id)initWithVout:(vout_thread_t *)_p_vout frame:(NSRect *)s_frame
+ {
+ int i_timeout;
++ vlc_value_t value_drawable;
+
+ p_vout = _p_vout;
+
+- /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */
+- for( i_timeout = 20 ; i_timeout-- ; )
++ var_Get( p_vout->p_vlc, "drawable", &value_drawable );
++
++ if( value_drawable.i_int == 0 )
+ {
++ /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */
++ for( i_timeout = 20 ; i_timeout-- ; )
++ {
++ if( NSApp == NULL )
++ {
++ msleep( INTF_IDLE_SLEEP );
++ }
++ }
++
+ if( NSApp == NULL )
+ {
+- msleep( INTF_IDLE_SLEEP );
++ /* No MacOS X intf, unable to communicate with MT */
++ msg_Err( p_vout, "no MacOS X interface present" );
++ return NULL;
+ }
+ }
+
+- if( NSApp == NULL )
+- {
+- /* No MacOS X intf, unable to communicate with MT */
+- msg_Err( p_vout, "no MacOS X interface present" );
+- return NULL;
+- }
+-
+ /* p_real_vout: the vout we have to use to check for video-on-top
+ and a few other things. If we are the QuickTime output, it's us.
+ It we are the OpenGL provider, it is our parent. */
+Index: modules/gui/macosx/voutqt.m
+===================================================================
+--- modules/gui/macosx/voutqt.m (revision 10061)
++++ modules/gui/macosx/voutqt.m (working copy)
+@@ -70,6 +70,12 @@
+ MatrixRecordPtr p_matrix;
+ DecompressorComponent img_dc;
+ ImageDescriptionHandle h_img_descr;
++
++ /* Mozilla plugin-related variables */
++ CGrafPtr p_previous_qdport;
++ vlc_bool_t b_embedded;
++ Rect rect; /* can use s_frame for this instead? */ /* clipping rect */
++ int portx, porty;
+ };
+
+ struct picture_sys_t
+@@ -104,9 +110,10 @@
+ * This function allocates and initializes a MacOS X vout method.
+ *****************************************************************************/
+ int E_(OpenVideoQT) ( vlc_object_t *p_this )
+-{
++{
+ vout_thread_t * p_vout = (vout_thread_t *)p_this;
+ OSErr err;
++ vlc_value_t value_drawable;
+
+ p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
+ if( p_vout->p_sys == NULL )
+@@ -126,13 +133,31 @@
+ p_vout->pf_display = DisplayVideo;
+ p_vout->pf_control = ControlVideo;
+
+- /* Spawn window */
+- p_vout->p_sys->o_window =
+- [[VLCWindow alloc] initWithVout: p_vout frame: nil];
+- if( !p_vout->p_sys->o_window )
++ /* Are we embedded? If so, the drawable value will be a pointer to a
++ * CGrafPtr that we're expected to use */
++ var_Get( p_vout->p_vlc, "drawable", &value_drawable );
++ if( value_drawable.i_int != 0 )
++ p_vout->p_sys->b_embedded = VLC_TRUE;
++ else
++ p_vout->p_sys->b_embedded = VLC_FALSE;
++
++ if( p_vout->p_sys->b_embedded )
+ {
+- return VLC_EGENERIC;
++ p_vout->p_sys->rect.left = 0;
++ p_vout->p_sys->rect.right = 0;
++ p_vout->p_sys->rect.top = 0;
++ p_vout->p_sys->rect.bottom = 0;
+ }
++ else
++ {
++ /* Spawn window */
++ p_vout->p_sys->o_window =
++ [[VLCWindow alloc] initWithVout: p_vout frame: nil];
++ if( !p_vout->p_sys->o_window )
++ {
++ return VLC_EGENERIC;
++ }
++ }
+
+ p_vout->p_sys->b_altivec = p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC;
+ msg_Dbg( p_vout, "We do%s have Altivec", p_vout->p_sys->b_altivec ? "" : "n't" );
+@@ -196,14 +221,26 @@
+
+ #define o_qtview p_vout->p_sys->o_qtview
+ o_qtview = [[VLCQTView alloc] initWithVout: p_vout];
++
+ [p_vout->p_sys->o_window setContentView: o_qtview];
+ [o_qtview autorelease];
+
+ /* Retrieve the QuickDraw port */
+- [o_qtview lockFocus];
+- p_vout->p_sys->p_qdport = [o_qtview qdPort];
+- [o_qtview unlockFocus];
++ if( p_vout->p_sys->b_embedded )
++ {
++ /* Don't need (nor want) to lock the focus, since otherwise we crash
++ * (presumably because we don't own the window, but I'm not sure
++ * if this is the exact reason) */
++ p_vout->p_sys->p_qdport = [o_qtview qdPort];
++ }
++ else
++ {
++ [o_qtview lockFocus];
++ p_vout->p_sys->p_qdport = [o_qtview qdPort];
++ [o_qtview unlockFocus];
++ }
+ #undef o_qtview
++ fprintf(stderr, "p_qdport is %p\n", p_vout->p_sys->p_qdport);
+
+ return VLC_SUCCESS;
+ }
+@@ -216,7 +253,8 @@
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ vout_thread_t * p_vout = (vout_thread_t *)p_this;
+
+- [p_vout->p_sys->o_window close];
++ if( !p_vout->p_sys->b_embedded )
++ [p_vout->p_sys->o_window close];
+
+ /* Clean Up Quicktime environment */
+ ExitMovies();
+@@ -244,6 +282,16 @@
+ p_vout->output.i_height = p_vout->render.i_height;
+ p_vout->output.i_aspect = p_vout->render.i_aspect;
+
++ /* If we are embedded (e.g. running as a Mozilla plugin), use the pointer
++ * stored in the "drawable" value as the CGrafPtr for the QuickDraw
++ * graphics port */
++ if( p_vout->p_sys->b_embedded )
++ {
++ vlc_value_t val;
++ var_Get( p_vout->p_vlc, "drawable", &val );
++ p_vout->p_sys->p_qdport = (CGrafPtr) val.i_int;
++ }
++
+ SetPort( p_vout->p_sys->p_qdport );
+ QTScaleMatrix( p_vout );
+
+@@ -308,6 +356,9 @@
+ *****************************************************************************/
+ static int ManageVideo( vout_thread_t *p_vout )
+ {
++ vlc_value_t val;
++ var_Get( p_vout->p_vlc, "drawableredraw", &val );
++
+ if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
+ {
+ if( CoToggleFullscreen( p_vout ) )
+@@ -318,17 +369,35 @@
+ p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
+ }
+
+- if( p_vout->i_changes & VOUT_SIZE_CHANGE )
++ if( p_vout->i_changes & VOUT_SIZE_CHANGE ||
++ ( p_vout->p_sys->b_embedded && val.i_int == 1 ) )
+ {
+- QTScaleMatrix( p_vout );
+- SetDSequenceMatrix( p_vout->p_sys->i_seq,
+- p_vout->p_sys->p_matrix );
+-
+- p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
++ if ( p_vout->p_sys->b_embedded && val.i_int == 1 )
++ fprintf( stderr, "change in size/drawableredraw detected\n" );
++
++ if( p_vout->i_changes & VOUT_SIZE_CHANGE )
++ fprintf( stderr, "VOUT_SIZE_CHANGE detected\n" );
++
++ if( p_vout->p_sys->b_embedded )
++ {
++ val.i_int = 0;
++ var_Set( p_vout->p_vlc, "drawableredraw", val );
++ QTScaleMatrix( p_vout );
++ SetDSequenceMatrix( p_vout->p_sys->i_seq,
++ p_vout->p_sys->p_matrix );
++ }
++ else
++ {
++ QTScaleMatrix( p_vout );
++ SetDSequenceMatrix( p_vout->p_sys->i_seq,
++ p_vout->p_sys->p_matrix );
++
++ p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
++ }
+ }
+
+ [p_vout->p_sys->o_window manage];
+-
++
+ return( 0 );
+ }
+
+@@ -342,17 +411,69 @@
+ OSErr err;
+ CodecFlags flags;
+
+- if( ( err = DecompressSequenceFrameWhen(
+- p_vout->p_sys->i_seq,
+- p_pic->p_sys->p_data,
+- p_pic->p_sys->i_size,
+- codecFlagUseImageBuffer, &flags, NULL, NULL ) != noErr ) )
++ Rect oldrect;
++ RgnHandle oldClip;
++
++ if( p_vout->p_sys->b_embedded )
+ {
+- msg_Warn( p_vout, "DecompressSequenceFrameWhen failed: %d", err );
++ oldClip = NewRgn();
++
++ /* In mozilla plugin, mozilla browser also draws things in
++ * the windows. So we have to update the port/Origin for each
++ * picture. FIXME : the vout should lock something ! */
++ //GetPort( &p_vout->p_sys->p_previous_qdport );
++ GetPortBounds( p_vout->p_sys->p_qdport, &oldrect );
++ GetClip( oldClip );
++
++ LockPortBits( p_vout->p_sys->p_qdport );
++
++ SetPort( p_vout->p_sys->p_qdport );
++ SetOrigin( p_vout->p_sys->portx , p_vout->p_sys->porty );
++ ClipRect( &p_vout->p_sys->rect );
++
++ /* TODO: merge this code with the code below */
++
++ if( ( err = DecompressSequenceFrameWhen(
++ p_vout->p_sys->i_seq,
++ p_pic->p_sys->p_data,
++ p_pic->p_sys->i_size,
++ codecFlagUseImageBuffer, &flags, NULL, NULL ) !=
++ noErr ) )
++ {
++ msg_Warn( p_vout, "DecompressSequenceFrameWhen1 failed: %d", err );
++ }
++ else
++ {
++ // QDFlushPortBuffer( p_vout->p_sys->p_qdport, NULL );
++ }
++
++ SetOrigin( oldrect.left , oldrect.top );
++ SetClip( oldClip );
++ //SetPort( p_vout->p_sys->p_previous_qdport );
++
++ UnlockPortBits( p_vout->p_sys->p_qdport );
++
++#if 0
++ fprintf( stderr, "OldPort: %p, NewPort: %p\n",
++ p_vout->p_sys->p_previous_qdport, p_vout->p_sys->p_qdport );
++#endif
++
+ }
+ else
+ {
+- QDFlushPortBuffer( p_vout->p_sys->p_qdport, nil );
++ if( ( err = DecompressSequenceFrameWhen(
++ p_vout->p_sys->i_seq,
++ p_pic->p_sys->p_data,
++ p_pic->p_sys->i_size,
++ codecFlagUseImageBuffer, &flags, NULL, NULL ) !=
++ noErr ) )
++ {
++ msg_Warn( p_vout, "DecompressSequenceFrameWhen2 failed: %d", err );
++ }
++ else
++ {
++ QDFlushPortBuffer( p_vout->p_sys->p_qdport, nil );
++ }
+ }
+ }
+
+@@ -448,11 +569,46 @@
+ unsigned int i_offset_x = 0;
+ unsigned int i_offset_y = 0;
+
++ vlc_value_t valt, vall, valb, valr, valx, valy, valw, valh,
++ valportx, valporty;
++
+ GetPortBounds( p_vout->p_sys->p_qdport, &s_rect );
+
+ i_width = s_rect.right - s_rect.left;
+ i_height = s_rect.bottom - s_rect.top;
+
++ var_Get( p_vout->p_vlc, "drawable", &val );
++ var_Get( p_vout->p_vlc, "drawablet", &valt );
++ var_Get( p_vout->p_vlc, "drawablel", &vall );
++ var_Get( p_vout->p_vlc, "drawableb", &valb );
++ var_Get( p_vout->p_vlc, "drawabler", &valr );
++ var_Get( p_vout->p_vlc, "drawablex", &valx );
++ var_Get( p_vout->p_vlc, "drawabley", &valy );
++ var_Get( p_vout->p_vlc, "drawablew", &valw );
++ var_Get( p_vout->p_vlc, "drawableh", &valh );
++ var_Get( p_vout->p_vlc, "drawableportx", &valportx );
++ var_Get( p_vout->p_vlc, "drawableporty", &valporty );
++
++ if( p_vout->p_sys->b_embedded )
++ {
++ p_vout->p_sys->portx = valportx.i_int;
++ p_vout->p_sys->porty = valporty.i_int;
++ p_vout->p_sys->p_qdport = (CGrafPtr) val.i_int;
++ i_width = valw.i_int;
++ i_height = valh.i_int;
++
++#if 0
++ SetRectRgn( p_vout->p_sys->mask , vall.i_int - valx.i_int ,
++ valt.i_int - valy.i_int , valr.i_int - valx.i_int ,
++ valb.i_int - valy.i_int );
++#endif
++
++ p_vout->p_sys->rect.top = 0;
++ p_vout->p_sys->rect.left = 0;
++ p_vout->p_sys->rect.bottom = valb.i_int - valt.i_int;
++ p_vout->p_sys->rect.right = valr.i_int - vall.i_int;
++ }
++
+ var_Get( p_vout, "macosx-stretch", &val );
+ if( val.b_bool )
+ {
+@@ -460,7 +616,7 @@
+ Long2Fix( p_vout->output.i_width ) );
+ factor_y = FixDiv( Long2Fix( i_height ),
+ Long2Fix( p_vout->output.i_height ) );
+-
++
+ }
+ else if( i_height * p_vout->output.i_aspect < i_width * VOUT_ASPECT_FACTOR )
+ {
+@@ -486,13 +642,13 @@
+
+ i_offset_y = (i_height - i_adj_height) / 2;
+ }
+-
++
+ SetIdentityMatrix( p_vout->p_sys->p_matrix );
+
+ ScaleMatrix( p_vout->p_sys->p_matrix,
+ factor_x, factor_y,
+ Long2Fix(0), Long2Fix(0) );
+-
++
+ TranslateMatrix( p_vout->p_sys->p_matrix,
+ Long2Fix(i_offset_x), Long2Fix(i_offset_y) );
+ }
Modified: AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff.files
===================================================================
--- AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff.files 2005-02-27 04:38:48 UTC (rev 975)
+++ AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff.files 2005-02-27 04:55:42 UTC (rev 976)
@@ -1,4 +1,5 @@
vlc.win32.nsi
configure.ac
mozilla/
+modules/gui/macosx/
--
andre
More information about the cvs-annodex
mailing list