By default, use the real size of the stream for the video output size.

configure.in

@@ -120,10 +120,10 @@ void foo() { int meuh; ntohl(meuh); }],,
  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl Check for inline function size limit
-CFLAGS="${save_CFLAGS} -finline-limit-20000"
+CFLAGS="${save_CFLAGS} -finline-limit-30000"
 AC_MSG_CHECKING([if \$CC accepts -finline-limit])
 AC_TRY_COMPILE([],,
- save_CFLAGS="${save_CFLAGS} -finline-limit-20000"; AC_MSG_RESULT(yes),
+ save_CFLAGS="${save_CFLAGS} -finline-limit-30000"; AC_MSG_RESULT(yes),
  AC_MSG_RESULT(no))
 
 dnl Check for Darwin plugin linking flags

include/video_output.h

@@ -5,7 +5,7 @@
  * thread, and destroy a previously oppenned video output thread.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_output.h,v 1.61 2001/05/30 17:03:11 sam Exp $
+ * $Id: video_output.h,v 1.62 2001/09/26 12:32:25 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -278,7 +278,7 @@ typedef struct vout_thread_s
 void            vout_InitBank           ( void );
 void            vout_EndBank            ( void );
 
-vout_thread_t * vout_CreateThread   ( int *pi_status );
+vout_thread_t * vout_CreateThread   ( int *pi_status, int i_width, int i_height );
 void            vout_DestroyThread  ( vout_thread_t *p_vout, int *pi_status );
 
 vout_fifo_t *   vout_CreateFifo         ( void );

plugins/beos/vout_beos.cpp

@@ -2,7 +2,7 @@
  * vout_beos.cpp: beos video output display method
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: vout_beos.cpp,v 1.29 2001/09/12 01:30:07 tcastley Exp $
+ * $Id: vout_beos.cpp,v 1.30 2001/09/26 12:32:25 massiot Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -350,10 +350,6 @@ int vout_Create( vout_thread_t *p_vout )
     }
     
     /* Set video window's size */
-    p_vout->i_width =  main_GetIntVariable( VOUT_WIDTH_VAR,
-                                            VOUT_WIDTH_DEFAULT );
-    p_vout->i_height = main_GetIntVariable( VOUT_HEIGHT_VAR,
-                                            VOUT_HEIGHT_DEFAULT );
 	p_vout->b_scale = true;
 	                                            
     intf_Msg("Initial Width: %d Height: %d", 

plugins/sdl/vout_sdl.c

@@ -2,7 +2,7 @@
  * vout_sdl.c: SDL video output display method
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_sdl.c,v 1.62 2001/08/06 20:45:55 gbazin Exp $
+ * $Id: vout_sdl.c,v 1.63 2001/09/26 12:32:25 massiot Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Pierre Baillet <oct@zoy.org>
@@ -193,10 +193,8 @@ static int vout_Create( vout_thread_t *p_vout )
                                 VOUT_FULLSCREEN_DEFAULT );
     p_vout->p_sys->b_overlay = main_GetIntVariable( VOUT_OVERLAY_VAR,
                                 VOUT_OVERLAY_DEFAULT );
-    p_vout->p_sys->i_width = main_GetIntVariable( VOUT_WIDTH_VAR, 
-                                VOUT_WIDTH_DEFAULT );
-    p_vout->p_sys->i_height = main_GetIntVariable( VOUT_HEIGHT_VAR,
-                                VOUT_HEIGHT_DEFAULT );
+    p_vout->p_sys->i_width = p_vout->i_width;
+    p_vout->p_sys->i_height = p_vout->i_height;
 
     p_vout->p_sys->p_display = NULL;
     p_vout->p_sys->p_overlay = NULL;

plugins/x11/vout_x11.c

@@ -2,7 +2,7 @@
  * vout_x11.c: X11 video output display method
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_x11.c,v 1.30 2001/08/03 16:04:17 gbazin Exp $
+ * $Id: vout_x11.c,v 1.31 2001/09/26 12:32:25 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -794,12 +794,8 @@ static int X11CreateWindow( vout_thread_t *p_vout )
     else
     {
         /* Set main window's size */
-        p_vout->p_sys->i_width =  main_GetIntVariable( VOUT_WIDTH_VAR,
-                                                       VOUT_WIDTH_DEFAULT );
-        p_vout->p_sys->i_height = main_GetIntVariable( VOUT_HEIGHT_VAR,
-                                                       VOUT_HEIGHT_DEFAULT );
-        p_vout->i_width =  p_vout->p_sys->i_width;
-        p_vout->i_height = p_vout->p_sys->i_height;
+        p_vout->p_sys->i_width = p_vout->i_width;
+        p_vout->p_sys->i_height = p_vout->i_height;
     }
 
     /* Prepare window manager hints and properties */

plugins/x11/vout_xvideo.c

@@ -2,7 +2,7 @@
  * vout_xvideo.c: Xvideo video output display method
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
- * $Id: vout_xvideo.c,v 1.26 2001/08/22 14:23:57 sam Exp $
+ * $Id: vout_xvideo.c,v 1.27 2001/09/26 12:32:25 massiot Exp $
  *
  * Authors: Shane Harper <shanegh@optusnet.com.au>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -802,10 +802,8 @@ static int XVideoCreateWindow( vout_thread_t *p_vout )
     }
     else
     {
-        p_vout->p_sys->i_window_width =  main_GetIntVariable( VOUT_WIDTH_VAR,
-                                                       VOUT_WIDTH_DEFAULT );
-        p_vout->p_sys->i_window_height = main_GetIntVariable( VOUT_HEIGHT_VAR,
-                                                       VOUT_HEIGHT_DEFAULT );
+        p_vout->p_sys->i_window_width =  p_vout->i_width;
+        p_vout->p_sys->i_window_height = p_vout->i_height;
     }
 
     /* Prepare window manager hints and properties */

src/spu_decoder/spu_decoder.c

@@ -2,7 +2,7 @@
  * spu_decoder.c : spu decoder thread
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: spu_decoder.c,v 1.48 2001/08/06 13:13:06 sam Exp $
+ * $Id: spu_decoder.c,v 1.49 2001/09/26 12:32:25 massiot Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -96,7 +96,7 @@ vlc_thread_t spudec_CreateThread( vdec_config_t * p_config )
     {
         intf_WarnMsg( 1, "spudec: no vout present, spawning one" );
 
-        p_spudec->p_vout = vout_CreateThread( NULL );
+        p_spudec->p_vout = vout_CreateThread( NULL, 0, 0 );
 
         /* Everything failed */
         if( p_spudec->p_vout == NULL )

src/video_decoder/vpar_headers.c

@@ -2,7 +2,7 @@
  * vpar_headers.c : headers parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_headers.c,v 1.8 2001/09/06 13:16:26 massiot Exp $
+ * $Id: vpar_headers.c,v 1.9 2001/09/26 12:32:25 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stphane Borel <stef@via.ecp.fr>
@@ -419,7 +419,8 @@ static void SequenceHeader( vpar_thread_t * p_vpar )
     {
         intf_WarnMsg( 1, "vpar: no vout present, spawning one" );
 
-        p_vpar->p_vout = vout_CreateThread( NULL );
+        p_vpar->p_vout = vout_CreateThread( NULL, p_vpar->sequence.i_width,
+                                            p_vpar->sequence.i_height );
 
         /* Everything failed */
         if( p_vpar->p_vout == NULL )

src/video_output/video_output.c

@@ -5,7 +5,7 @@
  * thread, and destroy a previously oppened video output thread.
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: video_output.c,v 1.139 2001/09/25 11:46:14 massiot Exp $
+ * $Id: video_output.c,v 1.140 2001/09/26 12:32:25 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -120,7 +120,7 @@ void vout_EndBank ( void )
  * If pi_status is NULL, then the function will block until the thread is ready.
  * If not, it will be updated using one of the THREAD_* constants.
  *****************************************************************************/
-vout_thread_t * vout_CreateThread   ( int *pi_status )
+vout_thread_t * vout_CreateThread   ( int *pi_status, int i_width, int i_height )
 {
     vout_thread_t * p_vout;                             /* thread descriptor */
     int             i_status;                               /* thread status */
@@ -175,10 +175,16 @@ vout_thread_t * vout_CreateThread   ( int *pi_status )
      * fields will probably be modified by the method, and are only
      * preferences */
     p_vout->i_changes           = 0;
-    p_vout->i_width               = main_GetIntVariable( VOUT_WIDTH_VAR,
-                                                         VOUT_WIDTH_DEFAULT );
-    p_vout->i_height              = main_GetIntVariable( VOUT_HEIGHT_VAR,
-                                                         VOUT_HEIGHT_DEFAULT );
+    p_vout->i_width             = main_GetIntVariable( VOUT_WIDTH_VAR, 0 );
+    if( !p_vout->i_width )
+    {
+        p_vout->i_width         = i_width ? i_width : VOUT_WIDTH_DEFAULT;
+    }
+    p_vout->i_height            = main_GetIntVariable( VOUT_HEIGHT_VAR, 0 );
+    if( !p_vout->i_height )
+    {
+        p_vout->i_height        = i_height ? i_height : VOUT_HEIGHT_DEFAULT;
+    }
     p_vout->i_bytes_per_line    = p_vout->i_width * 2;
     p_vout->i_screen_depth      = main_GetIntVariable( VOUT_DEPTH_VAR,
                                                          VOUT_DEPTH_DEFAULT );