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
93d6d949
Commit
93d6d949
authored
Dec 01, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout: handle pool callback failure (fixes #14908)
parent
abb3f838
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
src/video_output/video_output.c
src/video_output/video_output.c
+3
-1
src/video_output/vout_wrapper.c
src/video_output/vout_wrapper.c
+3
-0
No files found.
src/video_output/video_output.c
View file @
93d6d949
...
...
@@ -940,7 +940,9 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
assert
(
vout_IsDisplayFiltered
(
vd
)
==
!
sys
->
display
.
use_dr
);
if
(
sys
->
display
.
use_dr
&&
!
is_direct
)
{
picture_t
*
direct
=
picture_pool_Get
(
vout
->
p
->
display_pool
);
picture_t
*
direct
=
NULL
;
if
(
likely
(
vout
->
p
->
display_pool
!=
NULL
))
direct
=
picture_pool_Get
(
vout
->
p
->
display_pool
);
if
(
!
direct
)
{
picture_Release
(
todisplay
);
if
(
subpic
)
...
...
src/video_output/vout_wrapper.c
View file @
93d6d949
...
...
@@ -133,6 +133,9 @@ int vout_InitWrapper(vout_thread_t *vout)
const
unsigned
display_pool_size
=
allow_dr
?
__MAX
(
VOUT_MAX_PICTURES
,
reserved_picture
+
decoder_picture
)
:
3
;
picture_pool_t
*
display_pool
=
vout_display_Pool
(
vd
,
display_pool_size
);
if
(
display_pool
==
NULL
)
return
VLC_EGENERIC
;
#ifndef NDEBUG
if
(
picture_pool_GetSize
(
display_pool
)
<
display_pool_size
)
msg_Warn
(
vout
,
"Not enough display buffers in the pool, requested %d got %d"
,
...
...
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