generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc/ass_split: add ff_ prefix to ass_style_get().

Browse Source
This commit is contained in:
Clément Bœsch 2012-09-16 03:05:01 +02:00
parent 74434d3bfe
commit d214e5cfb4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ass_split.c
View File

@ -456,7 +456,7 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv,
return 0; 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; ASS *ass = &ctx->ass;
int i; int i;

2
libavcodec/ass_split.h
View File

@ -167,6 +167,6 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv,
* @param style name of the style to search for. * @param style name of the style to search for.
* @return the ASSStyle corresponding to style, or NULL if style can't be found * @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 */ #endif /* AVCODEC_ASS_SPLIT_H */

2
libavcodec/srtenc.c
View File

@ -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) 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) { if (st) {
int c = st->primary_color & 0xFFFFFF; int c = st->primary_color & 0xFFFFFF;
if (st->font_name && strcmp(st->font_name, ASS_DEFAULT_FONT) || if (st->font_name && strcmp(st->font_name, ASS_DEFAULT_FONT) ||