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
e865aed6
Commit
e865aed6
authored
Apr 20, 2015
by
Steve Lhomme
Committed by
Thomas Guillem
Apr 23, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout: don't try to blend if we know it's not going to work
Signed-off-by:
Thomas Guillem
<
thomas@gllm.fr
>
parent
92216e0c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
10 deletions
+11
-10
src/video_output/video_output.c
src/video_output/video_output.c
+11
-10
No files found.
src/video_output/video_output.c
View file @
e865aed6
...
...
@@ -933,16 +933,17 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
bool
is_direct
=
vout
->
p
->
decoder_pool
==
vout
->
p
->
display_pool
;
picture_t
*
todisplay
=
filtered
;
if
(
do_early_spu
&&
subpic
)
{
picture_t
*
blent
=
picture_pool_Get
(
vout
->
p
->
private_pool
);
if
(
blent
)
{
VideoFormatCopyCropAr
(
&
blent
->
format
,
&
filtered
->
format
);
picture_Copy
(
blent
,
filtered
);
if
(
vout
->
p
->
spu_blend
&&
picture_BlendSubpicture
(
blent
,
vout
->
p
->
spu_blend
,
subpic
))
{
picture_Release
(
todisplay
);
todisplay
=
blent
;
}
else
picture_Release
(
blent
);
if
(
vout
->
p
->
spu_blend
)
{
picture_t
*
blent
=
picture_pool_Get
(
vout
->
p
->
private_pool
);
if
(
blent
)
{
VideoFormatCopyCropAr
(
&
blent
->
format
,
&
filtered
->
format
);
picture_Copy
(
blent
,
filtered
);
if
(
picture_BlendSubpicture
(
blent
,
vout
->
p
->
spu_blend
,
subpic
))
{
picture_Release
(
todisplay
);
todisplay
=
blent
;
}
else
picture_Release
(
blent
);
}
}
subpicture_Delete
(
subpic
);
subpic
=
NULL
;
...
...
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