Changeset 46521919a639fba3fd7af954e41d007e41db8db1

Show
Ignore:
Timestamp:
26/08/08 16:13:39 (3 months ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1219760019 +0200
git-parent:

[762ecf80380436ebdc2ff0729848167687205a4d]

git-author:
Antoine Cellerier <dionoea@videolan.org> 1219760019 +0200
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/video_filter/canvas.c

    rbb255df r4652191  
    163163 
    164164    fmt.video.i_width = i_width; 
    165     fmt.video.i_height = ( p_filter->fmt_in.video.i_height * i_width * 
    166                          VOUT_ASPECT_FACTOR ) 
    167                          / ( p_filter->fmt_in.video.i_width 
    168                            * p_filter->fmt_in.video.i_aspect ); 
     165    fmt.video.i_height = ( p_filter->fmt_in.video.i_height * i_width ) 
     166                         / p_filter->fmt_in.video.i_width; 
    169167    if( fmt.video.i_height > i_height ) 
    170168    { 
    171169        fmt.video.i_height = i_height; 
    172         fmt.video.i_width = ( p_filter->fmt_in.video.i_width * i_height * 
    173                             p_filter->fmt_in.video.i_aspect ) 
    174                             / ( p_filter->fmt_in.video.i_height * 
    175                               VOUT_ASPECT_FACTOR ); 
     170        fmt.video.i_width = ( p_filter->fmt_in.video.i_width * i_height ) 
     171                            / p_filter->fmt_in.video.i_height; 
    176172        if( fmt.video.i_width & 1 ) fmt.video.i_width -= 1; 
    177173        i_padd = i_width - fmt.video.i_width;