From 7fc0df74caec0814a9f91c5f73566578914081aa Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Wed, 18 Dec 2002 08:08:30 +0000 Subject: [PATCH] * src/video_output/video_output.c: fixed a bug concerning the aspect ratio in vout_Request(). * INSTALL.win32: small update to the documentation. --- INSTALL.win32 | 14 ++++---------- src/video_output/video_output.c | 5 +++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/INSTALL.win32 b/INSTALL.win32 index 25963c2b6b..23c17aa4ef 100644 --- a/INSTALL.win32 +++ b/INSTALL.win32 @@ -69,12 +69,6 @@ exception of the autoconf tool for which I'm using the autoconf-devel-2.52-4 package (I had problems with 2.53a-1). You will need to make sure you install at least the gcc-mingw, mingw-runtime and w32api packages. -Also note that currently, even when using the -mno-cygwin option, the final -executable requires cygwin1.dll even if none of the objects linked to form the -executable does depend on cygwin1.dll itself. I don't know yet why the linker -plays this trick... - - NOTE: by default, the GTK package is configured to be installed in /usr/local/gtk-win32, if you want to change this path, then you need to edit the gtk-win32/bin/gtk-config file and change "gtk_dir=" accordingly. @@ -102,7 +96,7 @@ If you are cross-compiling from Debian, you can use something along those lines: ./bootstrap; \ - CC=i586-mingw32msvc-gcc \ + CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \ ./configure --host=i586-mingw32msvc --build=i386-linux \ --with-gtk-config-path=/usr/local/gtk-win32/bin \ --with-sdl-config-path=/usr/local/SDL-1.2.3-win32/i386-mingw32msvc/bin \ @@ -113,7 +107,7 @@ If you are cross-compiling using the mingw32 package provided by www.videolan.org, you have to use something along those lines: ./bootstrap; \ - CC=i586-mingw32msvc-gcc \ + CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \ PATH=/usr/local/cross-tools/bin:$PATH \ ./configure --host=i586-mingw32msvc --build=i386-linux \ --with-gtk-config-path=/usr/local/gtk-win32/bin \ @@ -134,14 +128,14 @@ If you are using cygwin, you can build vlc with or without the unix emulation layer (without is usually better). To build without the emulaion layer, use something like this: ./bootstrap; \ - CC="gcc -mno-cygwin" \ + CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \ ./configure \ --with-gtk-config-path=/cygdrive/c/dev/gtk-win32/bin \ --with-sdl-config-path=/cygdrive/c/dev/SDL-1.2.3-win32/i386-mingw32msvc/bin \ --with-directx=/cygdrive/c/dev/dxheaders \ --with-dvdcss-tree=../libdvdcss-win If you want to use the emulation layer, then just omit the CC="gcc -mno-cygwin" -line. +CXX="g++ -mno-cygwin" line. Note: when using the --with-dvdcss-tree you need to compile the libdvdcss tree beforehand. diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 73a39e5605..daae18aeb3 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -5,7 +5,7 @@ * thread, and destroy a previously oppened video output thread. ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: video_output.c,v 1.203 2002/12/07 23:50:31 massiot Exp $ + * $Id: video_output.c,v 1.204 2002/12/18 08:08:29 gbazin Exp $ * * Authors: Vincent Seguin * @@ -98,7 +98,8 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, { if( ( p_vout->render.i_width != i_width ) || ( p_vout->render.i_height != i_height ) || - ( p_vout->render.i_chroma != i_chroma ) ) + ( p_vout->render.i_chroma != i_chroma ) || + ( p_vout->render.i_aspect != i_aspect ) ) { /* We are not interested in this format, close this vout */ vlc_object_detach( p_vout ); -- 2.39.2