X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvideo_output%2Ffb.c;h=95ea2fe1a317b5df5284080e885488a52eb07b65;hb=4e9597b800d1140dfab1cf33c3df8c608d58878f;hp=91b28ba0d10b212eb8fc3922be545845fbce9108;hpb=7eaca895c90b3f14ab208373d0213d0579515e70;p=vlc

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 91b28ba0d1..95ea2fe1a3 100644
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -25,6 +25,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <errno.h>                                                 /* ENOMEM */
 #include <signal.h>                                      /* SIGUSR1, SIGUSR2 */
 #include <fcntl.h>                                                 /* open() */
@@ -38,11 +43,7 @@
 #include <linux/vt.h>                                                /* VT_* */
 #include <linux/kd.h>                                                 /* KD* */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 
@@ -132,7 +133,7 @@ struct vout_sys_t
 {
     /* System information */
     int                 i_tty;                          /* tty device handle */
-    bool          b_tty;
+    bool                b_tty;
     struct termios      old_termios;
 
     /* Original configuration information */
@@ -144,21 +145,21 @@ struct vout_sys_t
     int                         i_fd;                       /* device handle */
     struct fb_var_screeninfo    old_info;       /* original mode information */
     struct fb_var_screeninfo    var_info;        /* current mode information */
-    bool                  b_pan;     /* does device supports panning ? */
+    bool                        b_pan;     /* does device supports panning ? */
     struct fb_cmap              fb_cmap;                /* original colormap */
     uint16_t                    *p_palette;              /* original palette */
-    bool                  b_hw_accel;          /* has hardware support */
+    bool                        b_hw_accel;          /* has hardware support */
 
     /* Video information */
     uint32_t i_width;
     uint32_t i_height;
-    int i_aspect;
-    int i_bytes_per_pixel;
-    bool   b_auto;       /* Automatically adjust video size to fb size */
+    int      i_aspect;
+    int      i_bytes_per_pixel;
+    bool     b_auto;       /* Automatically adjust video size to fb size */
     vlc_fourcc_t i_chroma;
 
     /* Video memory */
-    uint8_t *    p_video;                                     /* base adress */
+    uint8_t    *p_video;                                      /* base adress */
     size_t      i_page_size;                                    /* page size */
 };
 
@@ -524,13 +525,12 @@ static int Init( vout_thread_t *p_vout )
     }
     p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
 
-    if( !p_sys->b_auto )
-    {
-        p_vout->render.i_width = p_sys->i_width;
-        p_vout->render.i_height = p_sys->i_height;
-    }
-    p_vout->output.i_width  = p_vout->fmt_out.i_width = p_sys->i_width;
-    p_vout->output.i_height = p_vout->fmt_out.i_height = p_sys->i_height;
+    p_vout->output.i_width =
+    p_vout->fmt_out.i_width =
+    p_vout->fmt_out.i_visible_width = p_sys->i_width;
+    p_vout->output.i_height =
+    p_vout->fmt_out.i_height =
+    p_vout->fmt_out.i_visible_height = p_sys->i_height;
 
     /* Assume we have square pixels */
     if( p_sys->i_aspect < 0 )