Commit ad852da0 authored by Laurent Aimar's avatar Laurent Aimar

Cosmetics.

parent 70514818
......@@ -455,26 +455,24 @@ void vout_PlacePicture( const vout_thread_t *p_vout,
unsigned int *restrict pi_width,
unsigned int *restrict pi_height )
{
if( (i_width <= 0) || (i_height <=0) )
if( i_width <= 0 || i_height <= 0 )
{
*pi_width = *pi_height = *pi_x = *pi_y = 0;
return;
}
bool b_autoscale = p_vout->b_autoscale;
int i_zoom = p_vout->i_zoom;
/* be realistic, scaling factor confined between .2 and 10. */
if( i_zoom > 10 * ZOOM_FP_FACTOR || i_zoom < ZOOM_FP_FACTOR / 5 )
i_zoom = ZOOM_FP_FACTOR;
if( b_autoscale )
if( p_vout->b_autoscale )
{
*pi_width = i_width;
*pi_height = i_height;
}
else
{
int i_zoom = p_vout->i_zoom;
/* be realistic, scaling factor confined between .2 and 10. */
if( i_zoom > 10 * ZOOM_FP_FACTOR || i_zoom < ZOOM_FP_FACTOR / 5 )
i_zoom = ZOOM_FP_FACTOR;
unsigned int i_original_width, i_original_height;
if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
......
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