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
39401931
Commit
39401931
authored
Mar 21, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
es_format: allow codecs to override spu styles
parent
84d7b276
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
include/vlc_es.h
include/vlc_es.h
+3
-0
src/misc/es_format.c
src/misc/es_format.c
+3
-0
No files found.
include/vlc_es.h
View file @
39401931
...
...
@@ -25,6 +25,7 @@
#define VLC_ES_H 1
#include <vlc_fourcc.h>
#include <vlc_text_style.h>
/**
* \file
...
...
@@ -356,6 +357,8 @@ struct subs_format_t
int
i_magazine
;
int
i_page
;
}
teletext
;
text_style_t
*
p_style
;
/* Default styles to use */
};
/**
...
...
src/misc/es_format.c
View file @
39401931
...
...
@@ -475,6 +475,7 @@ int es_format_Copy( es_format_t *dst, const es_format_t *src )
}
dst
->
subs
.
psz_encoding
=
dst
->
subs
.
psz_encoding
?
strdup
(
src
->
subs
.
psz_encoding
)
:
NULL
;
dst
->
subs
.
p_style
=
src
->
subs
.
p_style
?
text_style_Duplicate
(
src
->
subs
.
p_style
)
:
NULL
;
if
(
src
->
video
.
p_palette
)
{
...
...
@@ -523,6 +524,8 @@ void es_format_Clean( es_format_t *fmt )
free
(
fmt
->
video
.
p_palette
);
free
(
fmt
->
subs
.
psz_encoding
);
if
(
fmt
->
subs
.
p_style
)
text_style_Delete
(
fmt
->
subs
.
p_style
);
if
(
fmt
->
i_extra_languages
>
0
&&
fmt
->
p_extra_languages
)
{
int
i
;
...
...
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