Commit 49708746 authored by dionoea's avatar dionoea
Browse files

Use gray for the place holder color on packed formats (else you'd end up

with an ugly green in packed YUV).
parent 35877427
......@@ -143,7 +143,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
uint8_t black_pixel;
uint8_t *p_in, *p_out;
black_pixel = ( i_index == Y_PLANE ) ? 0x00 : 0x80;
black_pixel = ( p_pic->i_planes > 1 && i_index == Y_PLANE ) ? 0x00
: 0x80;
i_num_lines = p_pic->p[i_index].i_visible_lines;
i_pixel_pitch = p_pic->p[i_index].i_pixel_pitch;
......
......@@ -299,12 +299,12 @@ static int Init( vout_thread_t *p_vout )
w1 &= ~1;
h1 = w1 * VOUT_ASPECT_FACTOR / i_aspect&~1;
h1 &= ~1;
h2 = p_vout->output.i_height / p_vout->p_sys->i_row&~1;
h2 &= ~1;
w2 = h2 * i_aspect / VOUT_ASPECT_FACTOR&~1;
w2 &= ~1;
if ( h1 * p_vout->p_sys->i_row < p_vout->output.i_height )
{
unsigned int i_tmp;
......@@ -340,7 +340,7 @@ static int Init( vout_thread_t *p_vout )
p_vout->p_sys->i_vout = 0;
msg_Dbg( p_vout, "target window (%d,%d)-(%d,%d)", i_hstart,i_vstart,i_hend,i_vend );
i_top = 0;
i_height = 0;
......@@ -375,7 +375,7 @@ static int Init( vout_thread_t *p_vout )
i_align |= VOUT_ALIGN_RIGHT;
}
}
if( i_row * i_target_height >= i_vstart &&
( i_row + 1 ) * i_target_height <= i_vend )
{
......
/*****************************************************************************
* wave.c : Wave video effect plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2006 the VideoLAN team
* Copyright (C) 2000-2008 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
......@@ -152,7 +152,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
i_pixel_pitch = p_pic->p[i_index].i_pixel_pitch;
i_visible_pixels = i_visible_pitch/i_pixel_pitch;
black_pixel = ( i_index == Y_PLANE ) ? 0x00 : 0x80;
black_pixel = ( p_pic->i_planes > 1 && i_index == Y_PLANE ) ? 0x00
: 0x80;
/* Ok, we do 3 times the sin() calculation for each line. So what ? */
for( i_line = 0 ; i_line < i_num_lines ; i_line++ )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment