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
60491334
Commit
60491334
authored
Oct 21, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout: reorder code
No functional changes
parent
dfefe47f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
src/video_output/video_output.c
src/video_output/video_output.c
+10
-10
No files found.
src/video_output/video_output.c
View file @
60491334
...
...
@@ -965,16 +965,6 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
vout_display_Prepare
(
vd
,
todisplay
,
subpic
);
}
else
{
sys
->
display
.
filtered
=
vout_FilterDisplay
(
vd
,
todisplay
);
if
(
sys
->
display
.
filtered
)
{
if
(
!
do_dr_spu
&&
!
do_early_spu
&&
vout
->
p
->
spu_blend
&&
subpic
)
picture_BlendSubpicture
(
sys
->
display
.
filtered
,
vout
->
p
->
spu_blend
,
subpic
);
vout_display_Prepare
(
vd
,
sys
->
display
.
filtered
,
do_dr_spu
?
subpic
:
NULL
);
}
if
(
!
do_dr_spu
&&
subpic
)
{
subpicture_Delete
(
subpic
);
subpic
=
NULL
;
}
if
(
!
sys
->
display
.
filtered
)
{
if
(
subpic
!=
NULL
)
...
...
@@ -982,6 +972,16 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
return
VLC_EGENERIC
;
}
if
(
!
do_dr_spu
&&
!
do_early_spu
&&
vout
->
p
->
spu_blend
&&
subpic
)
picture_BlendSubpicture
(
sys
->
display
.
filtered
,
vout
->
p
->
spu_blend
,
subpic
);
vout_display_Prepare
(
vd
,
sys
->
display
.
filtered
,
do_dr_spu
?
subpic
:
NULL
);
if
(
!
do_dr_spu
&&
subpic
)
{
subpicture_Delete
(
subpic
);
subpic
=
NULL
;
}
todisplay
=
sys
->
display
.
filtered
;
}
...
...
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