Skip to content

V
vlc-gpu
Commit 46521919 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Revert something which never should have been commited (see... 

Revert something which never should have been commited (see bb255df4).
parent 762ecf80
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
modules/video_filter/canvas.c
View file @ 46521919
...@@ -162,17 +162,13 @@ static int Activate( vlc_object_t *p_this ) ...@@ -162,17 +162,13 @@ static int Activate( vlc_object_t *p_this )
es_format_Copy( &fmt, &p_filter->fmt_in ); es_format_Copy( &fmt, &p_filter->fmt_in );
fmt.video.i_width = i_width; fmt.video.i_width = i_width;
fmt.video.i_height = ( p_filter->fmt_in.video.i_height * i_width * fmt.video.i_height = ( p_filter->fmt_in.video.i_height * i_width )
VOUT_ASPECT_FACTOR ) / p_filter->fmt_in.video.i_width;
/ ( p_filter->fmt_in.video.i_width
* p_filter->fmt_in.video.i_aspect );
if( fmt.video.i_height > i_height ) if( fmt.video.i_height > i_height )
{ {
fmt.video.i_height = i_height; fmt.video.i_height = i_height;
fmt.video.i_width = ( p_filter->fmt_in.video.i_width * i_height * fmt.video.i_width = ( p_filter->fmt_in.video.i_width * i_height )
p_filter->fmt_in.video.i_aspect ) / p_filter->fmt_in.video.i_height;
/ ( p_filter->fmt_in.video.i_height *
VOUT_ASPECT_FACTOR );
if( fmt.video.i_width & 1 ) fmt.video.i_width -= 1; if( fmt.video.i_width & 1 ) fmt.video.i_width -= 1;
i_padd = i_width - fmt.video.i_width; i_padd = i_width - fmt.video.i_width;
/* Gruik */ /* Gruik */
......
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