Changeset 497087466251d63b5245082c5200f5df21a5af4f

Show
Ignore:
Timestamp:
04/06/08 16:51:20 (6 months ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1212591080 +0200
git-parent:

[35877427331f64d9ec9b7b662564722301908c65]

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

Use gray for the place holder color on packed formats (else you'd end up
with an ugly green in packed YUV).

Files:

Legend:

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

    r3561b9b r4970874  
    144144        uint8_t *p_in, *p_out; 
    145145 
    146         black_pixel = ( i_index == Y_PLANE ) ? 0x00 : 0x80; 
     146        black_pixel = ( p_pic->i_planes > 1 && i_index == Y_PLANE ) ? 0x00 
     147                                                                    : 0x80; 
    147148 
    148149        i_num_lines = p_pic->p[i_index].i_visible_lines; 
  • modules/video_filter/wall.c

    r53c7457 r4970874  
    300300    h1 = w1 * VOUT_ASPECT_FACTOR / i_aspect&~1; 
    301301    h1 &= ~1; 
    302   
     302 
    303303    h2 = p_vout->output.i_height / p_vout->p_sys->i_row&~1; 
    304304    h2 &= ~1; 
    305305    w2 = h2 * i_aspect / VOUT_ASPECT_FACTOR&~1; 
    306306    w2 &= ~1; 
    307   
     307 
    308308    if ( h1 * p_vout->p_sys->i_row < p_vout->output.i_height ) 
    309309    { 
     
    341341    p_vout->p_sys->i_vout = 0; 
    342342    msg_Dbg( p_vout, "target window (%d,%d)-(%d,%d)", i_hstart,i_vstart,i_hend,i_vend ); 
    343   
     343 
    344344 
    345345    i_top = 0; 
     
    376376                } 
    377377            } 
    378   
     378 
    379379            if( i_row * i_target_height >= i_vstart && 
    380380                ( i_row + 1 ) * i_target_height <= i_vend ) 
  • modules/video_filter/wave.c

    r3561b9b r4970874  
    22 * wave.c : Wave video effect plugin for vlc 
    33 ***************************************************************************** 
    4  * Copyright (C) 2000-2006 the VideoLAN team 
     4 * Copyright (C) 2000-2008 the VideoLAN team 
    55 * $Id$ 
    66 * 
     
    153153        i_visible_pixels = i_visible_pitch/i_pixel_pitch; 
    154154 
    155         black_pixel = ( i_index == Y_PLANE ) ? 0x00 : 0x80; 
     155        black_pixel = ( p_pic->i_planes > 1 && i_index == Y_PLANE ) ? 0x00 
     156                                                                    : 0x80; 
    156157 
    157158        /* Ok, we do 3 times the sin() calculation for each line. So what ? */