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
96b23172
Commit
96b23172
authored
Dec 12, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed spu_DisplaySubpicture into spu_PutSubpicture.
parent
8e47c597
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
include/vlc_spu.h
include/vlc_spu.h
+1
-1
modules/stream_out/transcode/spu.c
modules/stream_out/transcode/spu.c
+1
-1
src/libvlccore.sym
src/libvlccore.sym
+1
-1
src/misc/filter_chain.c
src/misc/filter_chain.c
+1
-1
src/osd/osd_text.c
src/osd/osd_text.c
+1
-1
src/video_output/video_output.c
src/video_output/video_output.c
+1
-1
src/video_output/vout_subpictures.c
src/video_output/vout_subpictures.c
+1
-1
No files found.
include/vlc_spu.h
View file @
96b23172
...
...
@@ -68,7 +68,7 @@ VLC_EXPORT( void, spu_Destroy, ( spu_t * ) );
* You cannot use the provided subpicture anymore. The spu_t core
* will destroy it at its convenience.
*/
VLC_EXPORT
(
void
,
spu_
Display
Subpicture
,
(
spu_t
*
,
subpicture_t
*
)
);
VLC_EXPORT
(
void
,
spu_
Put
Subpicture
,
(
spu_t
*
,
subpicture_t
*
)
);
/**
* This function will return an unique subpicture containing the OSD and
...
...
modules/stream_out/transcode/spu.c
View file @
96b23172
...
...
@@ -141,7 +141,7 @@ int transcode_spu_process( sout_stream_t *p_stream,
if
(
p_sys
->
b_soverlay
)
{
spu_
Display
Subpicture
(
p_sys
->
p_spu
,
p_subpic
);
spu_
Put
Subpicture
(
p_sys
->
p_spu
,
p_subpic
);
}
else
{
...
...
src/libvlccore.sym
View file @
96b23172
...
...
@@ -401,7 +401,7 @@ sout_StreamChainNew
sout_UpdateStatistic
spu_Create
spu_Destroy
spu_
Display
Subpicture
spu_
Put
Subpicture
spu_ChangeFilters
spu_Render
spu_RegisterChannel
...
...
src/misc/filter_chain.c
View file @
96b23172
...
...
@@ -302,7 +302,7 @@ void filter_chain_SubFilter( filter_chain_t *p_chain,
subpicture_t
*
p_subpic
=
p_filter
->
pf_sub_filter
(
p_filter
,
display_date
);
/* XXX I find that spu_t cast ugly */
if
(
p_subpic
)
spu_
Display
Subpicture
(
(
spu_t
*
)
p_chain
->
p_this
,
p_subpic
);
spu_
Put
Subpicture
(
(
spu_t
*
)
p_chain
->
p_this
,
p_subpic
);
}
}
...
...
src/osd/osd_text.c
View file @
96b23172
...
...
@@ -106,7 +106,7 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel,
p_spu
->
p_region
->
i_x
=
i_hmargin
;
p_spu
->
p_region
->
i_y
=
i_vmargin
;
spu_
Display
Subpicture
(
p_spu_channel
,
p_spu
);
spu_
Put
Subpicture
(
p_spu_channel
,
p_spu
);
return
VLC_SUCCESS
;
}
...
...
src/video_output/video_output.c
View file @
96b23172
...
...
@@ -1082,7 +1082,7 @@ static void ThreadManage(vout_thread_t *vout,
static
void
ThreadDisplaySubpicture
(
vout_thread_t
*
vout
,
subpicture_t
*
subpicture
)
{
spu_
Display
Subpicture
(
vout
->
p
->
spu
,
subpicture
);
spu_
Put
Subpicture
(
vout
->
p
->
spu
,
subpicture
);
}
static
void
ThreadFlushSubpicture
(
vout_thread_t
*
vout
,
int
channel
)
...
...
src/video_output/vout_subpictures.c
View file @
96b23172
...
...
@@ -316,7 +316,7 @@ int spu_ProcessMouse( spu_t *p_spu,
* \param p_spu the subpicture unit object
* \param p_subpic the subpicture to display
*/
void
spu_
Display
Subpicture
(
spu_t
*
p_spu
,
subpicture_t
*
p_subpic
)
void
spu_
Put
Subpicture
(
spu_t
*
p_spu
,
subpicture_t
*
p_subpic
)
{
spu_private_t
*
p_sys
=
p_spu
->
p
;
...
...
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