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
6650b321
Commit
6650b321
authored
10 years ago
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
spu: fix ugly cast in filter chain (and unexport function)
parent
ac075dbf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
6 deletions
+4
-6
include/vlc_filter.h
include/vlc_filter.h
+1
-1
src/libvlccore.sym
src/libvlccore.sym
+0
-1
src/misc/filter_chain.c
src/misc/filter_chain.c
+2
-3
src/video_output/vout_subpictures.c
src/video_output/vout_subpictures.c
+1
-1
No files found.
include/vlc_filter.h
View file @
6650b321
...
...
@@ -400,7 +400,7 @@ VLC_API block_t * filter_chain_AudioFilter( filter_chain_t *, block_t * );
* \param p_chain pointer to filter chain
* \param display_date of subpictures
*/
VLC_API
void
filter_chain_SubSource
(
filter_chain
_t
*
,
mtime_t
);
void
filter_chain_SubSource
(
filter_chain_t
*
,
spu
_t
*
,
mtime_t
);
/**
* Apply filter chain to subpictures.
...
...
This diff is collapsed.
Click to expand it.
src/libvlccore.sym
View file @
6650b321
...
...
@@ -128,7 +128,6 @@ filter_chain_MouseFilter
filter_chain_MouseEvent
filter_chain_New
filter_chain_Reset
filter_chain_SubSource
filter_chain_SubFilter
filter_chain_VideoFilter
filter_chain_VideoFlush
...
...
This diff is collapsed.
Click to expand it.
src/misc/filter_chain.c
View file @
6650b321
...
...
@@ -335,16 +335,15 @@ block_t *filter_chain_AudioFilter( filter_chain_t *p_chain, block_t *p_block )
return
p_block
;
}
void
filter_chain_SubSource
(
filter_chain_t
*
p_chain
,
void
filter_chain_SubSource
(
filter_chain_t
*
p_chain
,
spu_t
*
spu
,
mtime_t
display_date
)
{
for
(
chained_filter_t
*
f
=
p_chain
->
first
;
f
!=
NULL
;
f
=
f
->
next
)
{
filter_t
*
p_filter
=
&
f
->
filter
;
subpicture_t
*
p_subpic
=
p_filter
->
pf_sub_source
(
p_filter
,
display_date
);
/* XXX I find that spu_t cast ugly */
if
(
p_subpic
)
spu_PutSubpicture
(
(
spu_t
*
)
p_chain
->
p_this
,
p_subpic
);
spu_PutSubpicture
(
spu
,
p_subpic
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/video_output/vout_subpictures.c
View file @
6650b321
...
...
@@ -1441,7 +1441,7 @@ subpicture_t *spu_Render(spu_t *spu,
free
(
chain_update
);
}
/* Run subpicture sources */
filter_chain_SubSource
(
sys
->
source_chain
,
render_osd_date
);
filter_chain_SubSource
(
sys
->
source_chain
,
spu
,
render_osd_date
);
vlc_mutex_unlock
(
&
sys
->
source_chain_lock
);
static
const
vlc_fourcc_t
chroma_list_default_yuv
[]
=
{
...
...
This diff is collapsed.
Click to expand it.
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