Skip to content

V
vlc
Commit e96eb744 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Fix scaling of subpicture in fb video_output.

parent c28d3216
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
modules/video_output/fb.c
View file @ e96eb744
...@@ -483,6 +483,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -483,6 +483,7 @@ static int Init( vout_thread_t *p_vout )
I_OUTPUTPICTURES = 0; I_OUTPUTPICTURES = 0;
p_vout->fmt_out = p_vout->fmt_in;
if( p_sys->i_chroma == 0 ) if( p_sys->i_chroma == 0 )
{ {
/* Initialize the output structure: RGB with square pixels, whatever /* Initialize the output structure: RGB with square pixels, whatever
...@@ -526,8 +527,8 @@ static int Init( vout_thread_t *p_vout ) ...@@ -526,8 +527,8 @@ static int Init( vout_thread_t *p_vout )
p_vout->render.i_width = p_sys->i_width; p_vout->render.i_width = p_sys->i_width;
p_vout->render.i_height = p_sys->i_height; p_vout->render.i_height = p_sys->i_height;
} }
p_vout->output.i_width = p_sys->i_width; p_vout->output.i_width = p_vout->fmt_out.i_width = p_sys->i_width;
p_vout->output.i_height = p_sys->i_height; p_vout->output.i_height = p_vout->fmt_out.i_height = p_sys->i_height;
/* Assume we have square pixels */ /* Assume we have square pixels */
if( p_sys->i_aspect < 0 ) if( p_sys->i_aspect < 0 )
...@@ -539,6 +540,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -539,6 +540,7 @@ static int Init( vout_thread_t *p_vout )
p_vout->fmt_out.i_sar_num = p_vout->fmt_out.i_sar_den = 1; p_vout->fmt_out.i_sar_num = p_vout->fmt_out.i_sar_den = 1;
p_vout->fmt_out.i_aspect = p_vout->render.i_aspect = p_vout->output.i_aspect; p_vout->fmt_out.i_aspect = p_vout->render.i_aspect = p_vout->output.i_aspect;
p_vout->fmt_out.i_x_offset= p_vout->fmt_out.i_y_offset = 0;
/* Clear the screen */ /* Clear the screen */
memset( p_sys->p_video, 0, p_sys->i_page_size ); memset( p_sys->p_video, 0, p_sys->i_page_size );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment