Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
55b3cfc7
Commit
55b3cfc7
authored
Nov 11, 2017
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ttml: rename OpenDemux/CloseDemux functions
This fixes duplicate symbols with a static build
parent
e26f8431
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
13 deletions
+13
-13
modules/codec/ttml/substtml.c
modules/codec/ttml/substtml.c
+4
-4
modules/codec/ttml/ttml.c
modules/codec/ttml/ttml.c
+2
-2
modules/codec/ttml/ttml.h
modules/codec/ttml/ttml.h
+4
-4
modules/demux/ttml.c
modules/demux/ttml.c
+3
-3
No files found.
modules/codec/ttml/substtml.c
View file @
55b3cfc7
...
...
@@ -1089,9 +1089,9 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
}
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
*
tt_
OpenDecoder: probe the decoder and return score
*****************************************************************************/
int
OpenDecoder
(
vlc_object_t
*
p_this
)
int
tt_
OpenDecoder
(
vlc_object_t
*
p_this
)
{
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
;
...
...
@@ -1111,9 +1111,9 @@ int OpenDecoder( vlc_object_t *p_this )
}
/*****************************************************************************
* CloseDecoder: clean up the decoder
*
tt_
CloseDecoder: clean up the decoder
*****************************************************************************/
void
CloseDecoder
(
vlc_object_t
*
p_this
)
void
tt_
CloseDecoder
(
vlc_object_t
*
p_this
)
{
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
...
...
modules/codec/ttml/ttml.c
View file @
55b3cfc7
...
...
@@ -43,7 +43,7 @@ vlc_module_begin ()
set_capability
(
"spu decoder"
,
10
)
set_shortname
(
N_
(
"TTML decoder"
))
set_description
(
N_
(
"TTML subtitles decoder"
)
)
set_callbacks
(
OpenDecoder
,
CloseDecoder
)
set_callbacks
(
tt_
OpenDecoder
,
tt_
CloseDecoder
)
set_category
(
CAT_INPUT
)
set_subcategory
(
SUBCAT_INPUT_SCODEC
)
add_integer
(
"ttml-align"
,
0
,
ALIGN_TEXT
,
ALIGN_LONGTEXT
,
false
)
...
...
@@ -54,7 +54,7 @@ vlc_module_begin ()
set_capability
(
"demux"
,
3
)
set_category
(
CAT_INPUT
)
set_subcategory
(
SUBCAT_INPUT_DEMUX
)
set_callbacks
(
OpenDemux
,
CloseDemux
)
set_callbacks
(
tt_
OpenDemux
,
tt_
CloseDemux
)
add_shortcut
(
"ttml"
)
vlc_module_end
()
...
...
modules/codec/ttml/ttml.h
View file @
55b3cfc7
...
...
@@ -18,11 +18,11 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
int
OpenDemux
(
vlc_object_t
*
p_this
);
void
CloseDemux
(
demux_t
*
p_demux
);
int
tt_
OpenDemux
(
vlc_object_t
*
p_this
);
void
tt_
CloseDemux
(
demux_t
*
p_demux
);
int
OpenDecoder
(
vlc_object_t
*
);
void
CloseDecoder
(
vlc_object_t
*
);
int
tt_
OpenDecoder
(
vlc_object_t
*
);
void
tt_
CloseDecoder
(
vlc_object_t
*
);
enum
{
...
...
modules/demux/ttml.c
View file @
55b3cfc7
...
...
@@ -391,7 +391,7 @@ static int Demux( demux_t* p_demux )
return
VLC_DEMUXER_SUCCESS
;
}
int
OpenDemux
(
vlc_object_t
*
p_this
)
int
tt_
OpenDemux
(
vlc_object_t
*
p_this
)
{
demux_t
*
p_demux
=
(
demux_t
*
)
p_this
;
demux_sys_t
*
p_sys
;
...
...
@@ -530,12 +530,12 @@ int OpenDemux( vlc_object_t* p_this )
return
VLC_SUCCESS
;
error:
CloseDemux
(
p_demux
);
tt_
CloseDemux
(
p_demux
);
return
VLC_EGENERIC
;
}
void
CloseDemux
(
demux_t
*
p_demux
)
void
tt_
CloseDemux
(
demux_t
*
p_demux
)
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
...
...
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