Commit 13268071 authored by Pierre's avatar Pierre

vout_pictures: Use unsigned for width and height in picture_Export.

parent abfdb004
...@@ -281,7 +281,7 @@ static inline void picture_Copy( picture_t *p_dst, const picture_t *p_src ) ...@@ -281,7 +281,7 @@ static inline void picture_Copy( picture_t *p_dst, const picture_t *p_src )
* picture to be encoded. If at most one of them is > 0 then the picture aspect * picture to be encoded. If at most one of them is > 0 then the picture aspect
* ratio will be kept. * ratio will be kept.
*/ */
VLC_EXPORT( int, picture_Export, ( vlc_object_t *p_obj, block_t **pp_image, video_format_t *p_fmt, picture_t *p_picture, vlc_fourcc_t i_format, int i_override_width, int i_override_height ) ); VLC_EXPORT( int, picture_Export, ( vlc_object_t *p_obj, block_t **pp_image, video_format_t *p_fmt, picture_t *p_picture, vlc_fourcc_t i_format, unsigned i_override_width, unsigned i_override_height ) );
/** /**
* This function will setup all fields of a picture_t without allocating any * This function will setup all fields of a picture_t without allocating any
......
...@@ -435,8 +435,8 @@ int vout_GetSnapshot( vout_thread_t *p_vout, ...@@ -435,8 +435,8 @@ int vout_GetSnapshot( vout_thread_t *p_vout,
if( psz_format && image_Type2Fourcc( psz_format ) ) if( psz_format && image_Type2Fourcc( psz_format ) )
i_format = image_Type2Fourcc( psz_format ); i_format = image_Type2Fourcc( psz_format );
const int i_override_width = var_GetInteger( p_vout, "snapshot-width" ); const unsigned i_override_width = var_GetInteger( p_vout, "snapshot-width" );
const int i_override_height = var_GetInteger( p_vout, "snapshot-height" ); const unsigned i_override_height = var_GetInteger( p_vout, "snapshot-height" );
if( picture_Export( VLC_OBJECT(p_vout), pp_image, p_fmt, if( picture_Export( VLC_OBJECT(p_vout), pp_image, p_fmt,
p_picture, i_format, i_override_width, i_override_height ) ) p_picture, i_format, i_override_width, i_override_height ) )
......
...@@ -1042,7 +1042,7 @@ int picture_Export( vlc_object_t *p_obj, ...@@ -1042,7 +1042,7 @@ int picture_Export( vlc_object_t *p_obj,
video_format_t *p_fmt, video_format_t *p_fmt,
picture_t *p_picture, picture_t *p_picture,
vlc_fourcc_t i_format, vlc_fourcc_t i_format,
int i_override_width, int i_override_height ) unsigned i_override_width, unsigned i_override_height )
{ {
/* */ /* */
video_format_t fmt_in = p_picture->format; video_format_t fmt_in = p_picture->format;
...@@ -1074,10 +1074,8 @@ int picture_Export( vlc_object_t *p_obj, ...@@ -1074,10 +1074,8 @@ int picture_Export( vlc_object_t *p_obj,
} }
/* */ /* */
fmt_out.i_width = ( i_override_width < 0 ) ? fmt_out.i_width = i_override_width > 0 ? i_override_width : i_original_width;
i_original_width : i_override_width; fmt_out.i_height = i_override_height > 0 ? i_override_height : i_original_height;
fmt_out.i_height = ( i_override_height < 0 ) ?
i_original_height : i_override_height;
/* scale if only one direction is provided */ /* scale if only one direction is provided */
if( fmt_out.i_height == 0 && fmt_out.i_width > 0 ) if( fmt_out.i_height == 0 && fmt_out.i_width > 0 )
......
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