Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
f3c950c9
Commit
f3c950c9
authored
Sep 02, 2007
by
Jean-Paul Saman
Committed by
Jean-Paul Saman
Mar 05, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove tabs and trailing whitespace.
parent
7e0b6fad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
modules/codec/dvbsub.c
modules/codec/dvbsub.c
+2
-2
modules/video_filter/osdmenu.c
modules/video_filter/osdmenu.c
+7
-7
No files found.
modules/codec/dvbsub.c
View file @
f3c950c9
...
...
@@ -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
;
...
...
modules/video_filter/osdmenu.c
View file @
f3c950c9
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment