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
174ded88
Commit
174ded88
authored
Feb 12, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle errors when no filter can be found to adapt from the decoder format to the display one.
parent
4dae8e1b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
src/video_output/display.c
src/video_output/display.c
+5
-5
src/video_output/video_output.c
src/video_output/video_output.c
+2
-0
No files found.
src/video_output/display.c
View file @
174ded88
...
...
@@ -424,11 +424,7 @@ static void VoutDisplayCreateRender(vout_display_t *vd)
break
;
}
if
(
!
filter
)
{
msg_Err
(
vd
,
"VoutDisplayCreateRender FAILED"
);
/* TODO */
assert
(
0
);
}
msg_Err
(
vd
,
"Failed to adapt decoder format to display"
);
}
static
void
VoutDisplayDestroyRender
(
vout_display_t
*
vd
)
...
...
@@ -1087,6 +1083,10 @@ picture_t *vout_FilterDisplay(vout_display_t *vd, picture_t *picture)
vout_display_owner_sys_t
*
osys
=
vd
->
owner
.
sys
;
assert
(
osys
->
filters
);
if
(
filter_chain_GetLength
(
osys
->
filters
)
<=
0
)
{
picture_Release
(
picture
);
return
NULL
;
}
return
filter_chain_VideoFilter
(
osys
->
filters
,
picture
);
}
...
...
src/video_output/video_output.c
View file @
174ded88
...
...
@@ -1020,6 +1020,8 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
}
if
(
!
do_dr_spu
&&
subpic
)
subpicture_Delete
(
subpic
);
if
(
!
sys
->
display
.
filtered
)
return
VLC_EGENERIC
;
}
vout_chrono_Stop
(
&
vout
->
p
->
render
);
...
...
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