[vlc-devel] commit: Revert something which never should have been commited ( see bb255df402eacd0fa0937997866dca6bbb3162ab). (Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Tue Aug 26 16:13:39 2008 +0200| [46521919a639fba3fd7af954e41d007e41db8db1] | committer: Antoine Cellerier 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=46521919a639fba3fd7af954e41d007e41db8db1
---

 modules/video_filter/canvas.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/video_filter/canvas.c b/modules/video_filter/canvas.c
index 642f26b..93110d6 100644
--- a/modules/video_filter/canvas.c
+++ b/modules/video_filter/canvas.c
@@ -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 */