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
bcd492fc
Commit
bcd492fc
authored
Sep 21, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cosmetics.
parent
609baf74
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
src/video_output/vout_subpictures.c
src/video_output/vout_subpictures.c
+3
-3
No files found.
src/video_output/vout_subpictures.c
View file @
bcd492fc
...
@@ -191,7 +191,7 @@ spu_t *__spu_Create( vlc_object_t *p_this )
...
@@ -191,7 +191,7 @@ spu_t *__spu_Create( vlc_object_t *p_this )
{
{
spu_t
*
p_spu
;
spu_t
*
p_spu
;
spu_private_t
*
p_sys
;
spu_private_t
*
p_sys
;
p_spu
=
vlc_custom_create
(
p_this
,
sizeof
(
spu_t
)
+
sizeof
(
spu_private_t
),
p_spu
=
vlc_custom_create
(
p_this
,
sizeof
(
spu_t
)
+
sizeof
(
spu_private_t
),
VLC_OBJECT_GENERIC
,
"subpicture"
);
VLC_OBJECT_GENERIC
,
"subpicture"
);
...
@@ -613,7 +613,7 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date,
...
@@ -613,7 +613,7 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date,
b_late
=
b_stop_valid
&&
p_current
->
i_stop
<=
display_date
;
b_late
=
b_stop_valid
&&
p_current
->
i_stop
<=
display_date
;
/* start_date will be used for correct automatic overlap support
/* start_date will be used for correct automatic overlap support
* in case picture that should not be displayed anymore (display_time)
* in case picture that should not be displayed anymore (display_time)
* overlap with a picture to be displayed (p_current->i_start) */
* overlap with a picture to be displayed (p_current->i_start) */
if
(
!
b_late
&&
!
p_current
->
b_ephemer
)
if
(
!
b_late
&&
!
p_current
->
b_ephemer
)
start_date
=
p_current
->
i_start
;
start_date
=
p_current
->
i_start
;
...
@@ -1601,7 +1601,7 @@ static int IntegerCmp( int64_t i0, int64_t i1 )
...
@@ -1601,7 +1601,7 @@ static int IntegerCmp( int64_t i0, int64_t i1 )
return
i0
<
i1
?
-
1
:
i0
>
i1
?
1
:
0
;
return
i0
<
i1
?
-
1
:
i0
>
i1
?
1
:
0
;
}
}
/**
/**
* This function compares 2 subpictures using the following properties
* This function compares 2 subpictures using the following properties
* (ordered by priority)
* (ordered by priority)
* 1. absolute positionning
* 1. absolute positionning
* 2. start time
* 2. start time
...
...
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