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

Clément Bœsch committed 14 years ago

Commit d214e5c1 parent 74434d33 files · +3 −3Browse files

Unified · Split

3 files

libavcodec/ass_split.c +1 −1
libavcodec/ass_split.h +1 −1
libavcodec/srtenc.c +1 −1

libavcodec/ass_split.c+1−1

@@ -456,7 +456,7 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks callbacks, void priv, · 455 unmodified lines
456	456	return 0;
457	457	}
458	458
459		−ASSStyle ass_style_get(ASSSplitContext ctx, const char *style)
	459	+ASSStyle ff_ass_style_get(ASSSplitContext ctx, const char *style)
460	460	{
461	461	ASS *ass = &ctx->ass;
462	462	int i;

libavcodec/ass_split.h+1−1

@@ -167,6 +167,6 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks callbacks, void priv, · 166 unmodified lines
167	167	* @param style name of the style to search for.
168	168	* @return the ASSStyle corresponding to style, or NULL if style can't be found
169	169	*/
170		−ASSStyle ass_style_get(ASSSplitContext ctx, const char *style);
	170	+ASSStyle ff_ass_style_get(ASSSplitContext ctx, const char *style);
171	171
172	172	#endif /* AVCODEC_ASS_SPLIT_H */

libavcodec/srtenc.c+1−1

@@ -96,7 +96,7 @@ static void srt_stack_push_pop(SRTContext *s, const char c, int close) · 95 unmodified lines
96	96
97	97	static void srt_style_apply(SRTContext s, const char style)
98	98	{
99		− ASSStyle *st = ass_style_get(s->ass_ctx, style);
	99	+ ASSStyle *st = ff_ass_style_get(s->ass_ctx, style);
100	100	if (st) {
101	101	int c = st->primary_color & 0xFFFFFF;
102	102	if (st->font_name && strcmp(st->font_name, ASS_DEFAULT_FONT) \|\|