* mingw32 cross-compilation issue fixed.
CFLAGS = @CFLAGS@
SHELL = @SHELL@
RANLIB = @RANLIB@
CFLAGS = @CFLAGS@
SHELL = @SHELL@
RANLIB = @RANLIB@
s%@OPTIMS@%$OPTIMS%g
s%@CSS@%$CSS%g
s%@MOC@%$MOC%g
s%@OPTIMS@%$OPTIMS%g
s%@CSS@%$CSS%g
s%@MOC@%$MOC%g
s%@LCFLAGS@%$LCFLAGS%g
s%@PLCFLAGS@%$PLCFLAGS%g
s%@LIB@%$LIB%g
s%@LCFLAGS@%$LCFLAGS%g
s%@PLCFLAGS@%$PLCFLAGS%g
s%@LIB@%$LIB%g
AC_SUBST(OPTIMS)
AC_SUBST(CSS)
AC_SUBST(MOC)
AC_SUBST(OPTIMS)
AC_SUBST(CSS)
AC_SUBST(MOC)
AC_SUBST(LCFLAGS)
AC_SUBST(PLCFLAGS)
AC_SUBST(LCFLAGS)
AC_SUBST(PLCFLAGS)
* vout_x11.c: X11 video output display method
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* vout_x11.c: X11 video output display method
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_x11.c,v 1.28 2001/06/25 11:34:08 sam Exp $
+ * $Id: vout_x11.c,v 1.29 2001/07/07 17:45:28 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
p_vout->p_sys->p_ximage[ p_vout->i_buffer_index ],
0, 0, 0, 0,
p_vout->p_sys->p_ximage[ p_vout->i_buffer_index ]->width,
p_vout->p_sys->p_ximage[ p_vout->i_buffer_index ],
0, 0, 0, 0,
p_vout->p_sys->p_ximage[ p_vout->i_buffer_index ]->width,
- p_vout->p_sys->p_ximage[ p_vout->i_buffer_index ]->height, True);
+ p_vout->p_sys->p_ximage[ p_vout->i_buffer_index ]->height, False);
/* Send the order to the X server */
XSync(p_vout->p_sys->p_display, False);
/* Send the order to the X server */
XSync(p_vout->p_sys->p_display, False);
* vout_xvideo.c: Xvideo video output display method
*****************************************************************************
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
* vout_xvideo.c: Xvideo video output display method
*****************************************************************************
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
- * $Id: vout_xvideo.c,v 1.20 2001/06/25 11:34:08 sam Exp $
+ * $Id: vout_xvideo.c,v 1.21 2001/07/07 17:45:29 sam Exp $
*
* Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr>
*
* Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr>
}
for( i=0; i < i_adaptors && xv_port == -1; ++i )
}
for( i=0; i < i_adaptors && xv_port == -1; ++i )
if( ( adaptor_info[ i ].type & XvInputMask ) &&
( adaptor_info[ i ].type & XvImageMask ) )
{
if( ( adaptor_info[ i ].type & XvInputMask ) &&
( adaptor_info[ i ].type & XvImageMask ) )
{
imageFormats = XvListImageFormats( dpy, port, &i_num_formats );
for( i=0; i < i_num_formats && xv_port == -1; ++i )
imageFormats = XvListImageFormats( dpy, port, &i_num_formats );
for( i=0; i < i_num_formats && xv_port == -1; ++i )
if( imageFormats[ i ].id == GUID_YUV12_PLANAR )
if( imageFormats[ i ].id == GUID_YUV12_PLANAR )
intf_WarnMsg( 3, "vout: XVideo image input port %d "
"does not support the YUV12 planar format which is "
intf_WarnMsg( 3, "vout: XVideo image input port %d "
"does not support the YUV12 planar format which is "
- "currently required by the xvideo output plugin.",
+ "currently required by the xvideo output plugin",
XvFreeAdaptorInfo(adaptor_info);
XvFreeAdaptorInfo(adaptor_info);
- intf_ErrMsg( "vout error: didn't find a suitable Xvideo image input port." );
+ {
+ intf_ErrMsg( "vout error: no suitable Xvideo image input port" );
+ }
{
int i_dest_width, i_dest_height, i_dest_x, i_dest_y;
{
int i_dest_width, i_dest_height, i_dest_x, i_dest_y;
- if( !p_vout->p_sys->p_xvimage ) return;
+ if( !p_vout->p_sys->p_xvimage )
+ {
+ return;
+ }
XVideoOutputCoords( p_vout->p_rendered_pic, p_vout->b_scale,
p_vout->p_sys->i_window_width,
XVideoOutputCoords( p_vout->p_rendered_pic, p_vout->b_scale,
p_vout->p_sys->i_window_width,
p_vout->p_rendered_pic->i_width,
p_vout->p_rendered_pic->i_height,
0 /*dest_x*/, 0 /*dest_y*/, i_dest_width, i_dest_height,
p_vout->p_rendered_pic->i_width,
p_vout->p_rendered_pic->i_height,
0 /*dest_x*/, 0 /*dest_y*/, i_dest_width, i_dest_height,
+ False );
+
+ XResizeWindow( p_vout->p_sys->p_display, p_vout->p_sys->yuv_window,
+ i_dest_width, i_dest_height );
+ XMoveWindow( p_vout->p_sys->p_display, p_vout->p_sys->yuv_window,
+ i_dest_x, i_dest_y );
- XResizeWindow( p_vout->p_sys->p_display, p_vout->p_sys->yuv_window,
- i_dest_width, i_dest_height );
- XMoveWindow( p_vout->p_sys->p_display, p_vout->p_sys->yuv_window,
- i_dest_x, i_dest_y );
+ /* Send the order to the X server */
+ XSync( p_vout->p_sys->p_display, False );