Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
d214e5cf
Commit
d214e5cf
authored
Sep 16, 2012
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/ass_split: add ff_ prefix to ass_style_get().
parent
74434d3b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ass_split.c
libavcodec/ass_split.c
+1
-1
ass_split.h
libavcodec/ass_split.h
+1
-1
srtenc.c
libavcodec/srtenc.c
+1
-1
No files found.
libavcodec/ass_split.c
View file @
d214e5cf
...
...
@@ -456,7 +456,7 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv,
return
0
;
}
ASSStyle
*
ass_style_get
(
ASSSplitContext
*
ctx
,
const
char
*
style
)
ASSStyle
*
ff_
ass_style_get
(
ASSSplitContext
*
ctx
,
const
char
*
style
)
{
ASS
*
ass
=
&
ctx
->
ass
;
int
i
;
...
...
libavcodec/ass_split.h
View file @
d214e5cf
...
...
@@ -167,6 +167,6 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv,
* @param style name of the style to search for.
* @return the ASSStyle corresponding to style, or NULL if style can't be found
*/
ASSStyle
*
ass_style_get
(
ASSSplitContext
*
ctx
,
const
char
*
style
);
ASSStyle
*
ff_
ass_style_get
(
ASSSplitContext
*
ctx
,
const
char
*
style
);
#endif
/* AVCODEC_ASS_SPLIT_H */
libavcodec/srtenc.c
View file @
d214e5cf
...
...
@@ -96,7 +96,7 @@ static void srt_stack_push_pop(SRTContext *s, const char c, int close)
static
void
srt_style_apply
(
SRTContext
*
s
,
const
char
*
style
)
{
ASSStyle
*
st
=
ass_style_get
(
s
->
ass_ctx
,
style
);
ASSStyle
*
st
=
ff_
ass_style_get
(
s
->
ass_ctx
,
style
);
if
(
st
)
{
int
c
=
st
->
primary_color
&
0xFFFFFF
;
if
(
st
->
font_name
&&
strcmp
(
st
->
font_name
,
ASS_DEFAULT_FONT
)
||
...
...
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