vout: expand stacking mode from boolean to unsigned

[vlc] / modules / video_output / omapfb.c

diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c
index 20765c62641eb8a45c86b0b9cac22a9b9bdd0122..45d77161e4f21e12ee4de51ddcf86a242efab3f7 100644 (file)
--- a/modules/video_output/omapfb.c
+++ b/modules/video_output/omapfb.c
@@ -232,7 +232,9 @@ static int Init( vout_thread_t *p_vout )
     vout_sys_t *p_sys = (vout_sys_t *)p_vout->p_sys;
 
     // We want to keep the same aspect
-    p_vout->fmt_out.i_aspect = p_vout->output.i_aspect = p_vout->render.i_aspect;
+    p_vout->output.i_aspect = p_vout->render.i_aspect;
+    p_vout->fmt_out.i_sar_num = p_vout->render.i_aspect * p_vout->render.i_height;
+    p_vout->fmt_out.i_sar_den = VOUT_ASPECT_FACTOR      * p_vout->render.i_width;
     // We ask where the video should be displayed in the video area
     vout_PlacePicture( p_vout, p_sys->main_window.i_width,
                        p_sys->main_window.i_height,
@@ -610,7 +612,7 @@ static void CreateWindow( vout_sys_t *p_sys )
     xwindow_attributes.event_mask = ExposureMask | StructureNotifyMask
                                   | VisibilityChangeMask;
     p_sys->window = XCreateWindow( p_sys->p_display,
-                                   p_sys->owner_window->handle.xid,
+                                   p_sys->owner_window->xid,
                                    0, 0,
                                    p_sys->main_window.i_width,
                                    p_sys->main_window.i_height,
@@ -620,7 +622,7 @@ static void CreateWindow( vout_sys_t *p_sys )
                                    &xwindow_attributes );
 
     XMapWindow( p_sys->p_display, p_sys->window );
-    XSelectInput( p_sys->p_display, p_sys->owner_window->handle.xid,
+    XSelectInput( p_sys->p_display, p_sys->owner_window->xid,
                   StructureNotifyMask );
 }