Ticket #60: xy_opt_fix.diff

File xy_opt_fix.diff, 860 bytes (added by reimar, 15 years ago)

should fix -xy option

  • libmpcodecs/vf_scale.c

    RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_scale.c,v
    retrieving revision 1.53
    diff -u -r1.53 vf_scale.c
     
    4040
    4141extern int opt_screen_size_x;
    4242extern int opt_screen_size_y;
     43extern float screen_size_xy;
    4344
    4445//===========================================================================//
    4546
     
    232233        break; }
    233234    }
    234235
    235     if(!opt_screen_size_x && !opt_screen_size_y){
     236    if(!opt_screen_size_x && !opt_screen_size_y && !(screen_size_xy >= 0.001)){
    236237        // Compute new d_width and d_height, preserving aspect
    237238        // while ensuring that both are >= output size in pixels.
    238239        if (vf->priv->h * d_width > vf->priv->w * d_height) {