Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
7f569759
Commit
7f569759
authored
Jun 07, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vdpau/chroma: remove dead code and simplify
parent
05e98ecf
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
16 deletions
+13
-16
modules/hw/vdpau/chroma.c
modules/hw/vdpau/chroma.c
+13
-16
No files found.
modules/hw/vdpau/chroma.c
View file @
7f569759
...
...
@@ -292,24 +292,21 @@ static picture_t *OutputAllocate(filter_t *filter)
picture_sys_t
*
psys
=
pic
->
p_sys
;
assert
(
psys
->
vdp
!=
NULL
);
if
(
unlikely
(
sys
->
vdp
!=
psys
->
vdp
)
&&
(
sys
->
mixer
!=
VDP_INVALID_HANDLE
))
{
Flush
(
filter
);
/* release surfaces from the old device */
vdp_video_mixer_destroy
(
sys
->
vdp
,
sys
->
mixer
);
vdp_release_x11
(
sys
->
vdp
);
sys
->
mixer
=
VDP_INVALID_HANDLE
;
if
(
likely
(
sys
->
mixer
!=
VDP_INVALID_HANDLE
))
{
/* Not the first output picture */
assert
(
psys
->
vdp
==
sys
->
vdp
);
return
pic
;
}
if
(
unlikely
(
sys
->
mixer
==
VDP_INVALID_HANDLE
))
{
/* First picture: get the context and allocate the mixer */
sys
->
vdp
=
vdp_hold_x11
(
psys
->
vdp
,
NULL
);
sys
->
device
=
psys
->
device
;
sys
->
mixer
=
MixerCreate
(
filter
);
if
(
sys
->
mixer
==
VDP_INVALID_HANDLE
)
goto
error
;
}
if
(
sys
->
mixer
!=
VDP_INVALID_HANDLE
)
return
pic
;
error:
vdp_release_x11
(
psys
->
vdp
);
psys
->
vdp
=
NULL
;
picture_Release
(
pic
);
return
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