Commit f3c950c9 authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Jean-Paul Saman

Remove tabs and trailing whitespace.

parent 7e0b6fad
......@@ -4,7 +4,7 @@
*****************************************************************************
* Copyright (C) 2003 ANEVIA
* Copyright (C) 2003-2005 the VideoLAN team
* $Id$
* $Id: 5ad7773edc7a88fc20dca0577e999d5dc6f991d7 $
*
* Authors: Gildas Bazin <gbazin@videolan.org>
* Damien LUCAS <damien.lucas@anevia.com>
......@@ -273,7 +273,7 @@ static int Open( vlc_object_t *p_this )
p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) );
memset( p_sys, 0, sizeof(decoder_sys_t) );
p_sys->i_pts = (mtime_t) 0;
p_sys->i_pts = (mtime_t) 0;
p_sys->i_id = p_dec->fmt_in.subs.dvb.i_id & 0xFFFF;
p_sys->i_ancillary_id = p_dec->fmt_in.subs.dvb.i_id >> 16;
......
......@@ -2,7 +2,7 @@
* osdmenu.c: osd filter module
*****************************************************************************
* Copyright (C) 2004-2005 M2X
* $Id$
* $Id: d837e0a881fa43e0a2719c8b20823755239b19a6 $
*
* Authors: Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
*
......@@ -83,7 +83,7 @@ static int CreateFilter ( vlc_object_t * );
static void DestroyFilter( vlc_object_t * );
static subpicture_t *Filter( filter_t *, mtime_t );
static int OSDMenuUpdateEvent( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
vlc_value_t, vlc_value_t, void * );
static int OSDMenuVisibleEvent( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
......@@ -251,7 +251,7 @@ error:
}
if( p_filter->p_sys->psz_file ) free( p_filter->p_sys->psz_file );
if( p_filter->p_sys ) free( p_filter->p_sys );
return VLC_EGENERIC;
return VLC_EGENERIC;
}
/*****************************************************************************
......@@ -397,17 +397,17 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t i_date )
if( !p_sys->b_update )
return NULL;
/* Am I too early? */
if( ( ( p_sys->i_last_date + p_sys->i_update ) > i_date ) &&
( p_sys->i_end_date > 0 ) )
return NULL; /* we are too early, so wait */
/* Allocate the subpicture internal data. */
p_spu = p_filter->pf_sub_buffer_new( p_filter );
if( !p_spu ) return NULL;
p_spu->b_ephemer = VLC_TRUE;
p_spu->b_fade = VLC_TRUE;
p_spu->b_fade = VLC_TRUE;
p_spu->b_absolute = p_sys->b_absolute;
p_spu->i_flags = p_sys->position;
......@@ -425,7 +425,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t i_date )
p_spu->i_stop = i_date + p_sys->i_timeout;
p_sys->i_end_date = p_spu->i_stop;
}
p_sys->i_last_date = i_date;
p_spu->i_start = p_sys->i_last_date = i_date;
......
Markdown is supported
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