Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
22da31ef
Commit
22da31ef
authored
Aug 19, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
subsdec: use var_Inherit()
parent
bf151581
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
modules/codec/subtitles/subsdec.c
modules/codec/subtitles/subsdec.c
+5
-5
No files found.
modules/codec/subtitles/subsdec.c
View file @
22da31ef
...
@@ -279,7 +279,7 @@ static int OpenDecoder( vlc_object_t *p_this )
...
@@ -279,7 +279,7 @@ static int OpenDecoder( vlc_object_t *p_this )
/* Second, try configured encoding */
/* Second, try configured encoding */
if
(
psz_charset
==
NULL
)
if
(
psz_charset
==
NULL
)
{
{
psz_charset
=
var_
CreateGetNonEmpty
String
(
p_dec
,
"subsdec-encoding"
);
psz_charset
=
var_
Inherit
String
(
p_dec
,
"subsdec-encoding"
);
msg_Dbg
(
p_dec
,
"trying configured character encoding: %s"
,
msg_Dbg
(
p_dec
,
"trying configured character encoding: %s"
,
psz_charset
?
psz_charset
:
"not specified"
);
psz_charset
?
psz_charset
:
"not specified"
);
}
}
...
@@ -303,7 +303,7 @@ static int OpenDecoder( vlc_object_t *p_this )
...
@@ -303,7 +303,7 @@ static int OpenDecoder( vlc_object_t *p_this )
msg_Dbg
(
p_dec
,
"trying default character encoding: %s"
,
msg_Dbg
(
p_dec
,
"trying default character encoding: %s"
,
psz_charset
?
psz_charset
:
"not specified"
);
psz_charset
?
psz_charset
:
"not specified"
);
if
(
var_
CreateGe
tBool
(
p_dec
,
"subsdec-autodetect-utf8"
))
if
(
var_
Inheri
tBool
(
p_dec
,
"subsdec-autodetect-utf8"
))
{
{
msg_Dbg
(
p_dec
,
"using automatic UTF-8 detection"
);
msg_Dbg
(
p_dec
,
"using automatic UTF-8 detection"
);
p_sys
->
b_autodetect_utf8
=
true
;
p_sys
->
b_autodetect_utf8
=
true
;
...
@@ -327,10 +327,10 @@ static int OpenDecoder( vlc_object_t *p_this )
...
@@ -327,10 +327,10 @@ static int OpenDecoder( vlc_object_t *p_this )
}
}
free
(
psz_charset
);
free
(
psz_charset
);
p_sys
->
i_align
=
var_
CreateGe
tInteger
(
p_dec
,
"subsdec-align"
);
p_sys
->
i_align
=
var_
Inheri
tInteger
(
p_dec
,
"subsdec-align"
);
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_SSA
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_SSA
&&
var_
CreateGe
tBool
(
p_dec
,
"subsdec-formatted"
)
)
&&
var_
Inheri
tBool
(
p_dec
,
"subsdec-formatted"
)
)
{
{
if
(
p_dec
->
fmt_in
.
i_extra
>
0
)
if
(
p_dec
->
fmt_in
.
i_extra
>
0
)
ParseSSAHeader
(
p_dec
);
ParseSSAHeader
(
p_dec
);
...
@@ -532,7 +532,7 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block )
...
@@ -532,7 +532,7 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block )
/* Remove formatting from string */
/* Remove formatting from string */
p_spu
->
p_region
->
psz_text
=
StripTags
(
psz_subtitle
);
p_spu
->
p_region
->
psz_text
=
StripTags
(
psz_subtitle
);
if
(
var_
CreateGe
tBool
(
p_dec
,
"subsdec-formatted"
)
)
if
(
var_
Inheri
tBool
(
p_dec
,
"subsdec-formatted"
)
)
{
{
p_spu
->
p_region
->
psz_html
=
CreateHtmlSubtitle
(
&
p_spu
->
p_region
->
i_align
,
psz_subtitle
);
p_spu
->
p_region
->
psz_html
=
CreateHtmlSubtitle
(
&
p_spu
->
p_region
->
i_align
,
psz_subtitle
);
}
}
...
...
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