diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-09-16 03:05:01 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-09-16 03:05:01 +0200 |
| commit | d214e5cfb414ea2b8cbcf3c4300288b130388d4a (patch) | |
| tree | 666d75490a8c82dff278030986dabf20194af90c | |
| parent | 74434d3bfe595f848b853d2d1b731aa4af8217fe (diff) | |
| download | ffmpeg-d214e5cfb414ea2b8cbcf3c4300288b130388d4a.tar.gz | |
lavc/ass_split: add ff_ prefix to ass_style_get().
| -rw-r--r-- | libavcodec/ass_split.c | 2 | ||||
| -rw-r--r-- | libavcodec/ass_split.h | 2 | ||||
| -rw-r--r-- | libavcodec/srtenc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 81d501eefe..7ee48b4a5c 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -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; diff --git a/libavcodec/ass_split.h b/libavcodec/ass_split.h index 2ce4eb5d9c..7a6a75e030 100644 --- a/libavcodec/ass_split.h +++ b/libavcodec/ass_split.h @@ -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 */ diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index dfc4e6c47c..fa85ef543b 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -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) || |