Commit 6675c2ba authored by dionoea's avatar dionoea
Browse files

Fix snapshot with default video size. Please *test* your changes before commiting.

parent 885b6b8a
...@@ -720,19 +720,25 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -720,19 +720,25 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
fmt_out.i_width = var_GetInteger( p_vout, "snapshot-width" ); fmt_out.i_width = var_GetInteger( p_vout, "snapshot-width" );
fmt_out.i_height = var_GetInteger( p_vout, "snapshot-height" ); fmt_out.i_height = var_GetInteger( p_vout, "snapshot-height" );
fmt_in = p_vout->fmt_in;
if( fmt_out.i_width == 0 && fmt_out.i_height > 0 ) if( fmt_out.i_width == 0 && fmt_out.i_height > 0 )
{ {
float f = (float)p_vout->fmt_in.i_height / fmt_out.i_height; float f = (float)fmt_in.i_height / fmt_out.i_height;
fmt_out.i_width = p_vout->fmt_in.i_width / f; fmt_out.i_width = fmt_in.i_width / f;
} }
else if( fmt_out.i_height == 0 && fmt_out.i_width > 0 ) else if( fmt_out.i_height == 0 && fmt_out.i_width > 0 )
{ {
float f = (float)p_vout->fmt_in.i_width / fmt_out.i_width; float f = (float)fmt_in.i_width / fmt_out.i_width;
fmt_out.i_height = p_vout->fmt_in.i_height / f; fmt_out.i_height = fmt_in.i_height / f;
}
else
{
fmt_out.i_width = fmt_in.i_width;
fmt_out.i_height = fmt_in.i_height;
} }
/* Save the snapshot */ /* Save the snapshot */
fmt_in = p_vout->fmt_in;
fmt_out.i_sar_num = fmt_out.i_sar_den = 1; fmt_out.i_sar_num = fmt_out.i_sar_den = 1;
i_ret = image_WriteUrl( p_image, p_pic, &fmt_in, &fmt_out, psz_filename ); i_ret = image_WriteUrl( p_image, p_pic, &fmt_in, &fmt_out, psz_filename );
if( i_ret != VLC_SUCCESS ) if( i_ret != VLC_SUCCESS )
......
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