Revert something which never should have been commited (see bb255df402eacd0fa09379978...
authorAntoine Cellerier <dionoea@videolan.org>
Tue, 26 Aug 2008 14:13:39 +0000 (16:13 +0200)
committerAntoine Cellerier <dionoea@videolan.org>
Tue, 26 Aug 2008 14:13:39 +0000 (16:13 +0200)
modules/video_filter/canvas.c

index 642f26b..93110d6 100644 (file)
@@ -162,17 +162,13 @@ static int Activate( vlc_object_t *p_this )
     es_format_Copy( &fmt, &p_filter->fmt_in );
 
     fmt.video.i_width = 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_aspect );
+    fmt.video.i_height = ( p_filter->fmt_in.video.i_height * i_width )
+                         / p_filter->fmt_in.video.i_width;
     if( 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 *
-                            p_filter->fmt_in.video.i_aspect )
-                            / ( p_filter->fmt_in.video.i_height *
-                              VOUT_ASPECT_FACTOR );
+        fmt.video.i_width = ( p_filter->fmt_in.video.i_width * i_height )
+                            / p_filter->fmt_in.video.i_height;
         if( fmt.video.i_width & 1 ) fmt.video.i_width -= 1;
         i_padd = i_width - fmt.video.i_width;
         /* Gruik */