mirror of https://git.ffmpeg.org/ffmpeg.git
lavc/ass_split: add ff_ prefix to ass_style_get().
This commit is contained in:
parent
74434d3bfe
commit
d214e5cfb4
|
@ -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;
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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) ||
|
||||
|
|
Loading…
Reference in New Issue